Minor changes to deploy script
Merge branch 'master' into gh-pages