Merge pull request #642 from errordeveloper/post-docs-move

Fixes post #612

site/build-and-publish.sh

@@ -22,11 +22,11 @@ export BRANCH COMMIT OUTPUT
 bundle install --path=.bundle
 bundle exec jekyll build --verbose
 
-gsutil -m cp -z html,css -a public-read -R _site "gs://docs.weave.works/${OUTPUT}"
+gsutil -m rsync -d _site "gs://docs.weave.works/${OUTPUT}"
 
 echo "Published at http://docs.weave.works/${OUTPUT}"
 
-if [ -z "${TRAVIS_TAG}" ]; then
+if [ -z "${TRAVIS_TAG}" -a ! "${BRANCH}" = "latest_release_doc_updates" ]; then
   echo "<meta http-equiv=\"refresh\" content=\"0; url=http://docs.weave.works/${OUTPUT}\" />" \
     | gsutil \
       -h "Content-Type:text/html" \