Another attempt at fixing docs upload.

.travis.yml

@@ -4,7 +4,11 @@ rust:
   - beta
   - stable
 script: make test
-after_success: "[ $TRAVIS_RUST_VERSION == stable ] && make upload-doc"
+after_success: |
+  [ $TRAVIS_RUST_VERSION = nightly ] &&
+  [ $TRAVIS_BRANCH = master ] &&
+  [ $TRAVIS_PULL_REQUEST = false ] &&
+  make upload-doc
 env:
   - secure: Q5eFkWSv20gCxMXrF1BPBSY67qAi9XYKsGHbOc6c1hOf933AX9Wr2CqL8mBhgAZfe4TWEnazjMNHmVIs75W+DPRkxVjImDmPLlQSDNuQFKBGATL5rnx7UzgT7t6CZhG+aPr50VVuC/3IL1+Ok85DjT/LnOKaao3r+Wd+HMFVViM=
 notifications:

Makefile

@@ -3,7 +3,7 @@ test:
 	[ x$$TRAVIS_RUST_VERSION != xnightly ] || cargo test --features heap_size
 
 doc:
-	cargo doc --features "query_encoding serde_serialization"
+	cargo doc --features "query_encoding serde rustc-serialize"
 	@echo '<meta http-equiv=refresh content=0;url=url/index.html>' > target/doc/index.html
 	@cp github.png target/doc/
 
@@ -12,6 +12,6 @@ upload-doc: doc
 	test "$(TRAVIS_PULL_REQUEST)" = false
 	sudo pip install ghp-import
 	ghp-import -n target/doc
-	git push -qf https://$(TOKEN)@github.com/$(TRAVIS_REPO_SLUG).git gh-pages
+	@git push -qf https://$(TOKEN)@github.com/$(TRAVIS_REPO_SLUG).git gh-pages
 
 .PHONY: test doc upload-doc