130717 Not sure
Merge branch 'working' of https://github.com/bodington/qiime-deploy-conf into working