Updated deploy-dreamhost script.
Updated deploy script.
Merge branch 'master' into dreamhost
Version 48400cde-be8a-11e2-8c3a-00216b196868