More doc upload fixes

.travis/update_docs.sh

@@ -2,17 +2,15 @@
 
 set -o errexit -o nounset
 
-rev=$(git rev-parse --short HEAD)
-
 git clone --branch gh-pages "https://$GH_TOKEN@github.com/${TRAVIS_REPO_SLUG}.git" deploy_docs
 cd deploy_docs
 
 git config user.name "Steven Fackler"
 git config user.email "sfackler@gmail.com"
 
-rm -rf docs
-mv ../target/docs .
+rm -rf doc
+mv ../target/doc .
 
 git add -A .
-git commit -m "rebuild pages at ${rev}"
+git commit -m "rebuild pages at ${TRAVIS_COMMIT}"
 git push