Merge branch master of github.com:mathbio/nikola-site Minor changes to conf.py First version of automatic deployer.