Modified deploy-dreamhost.
Merge master into branch dreamhost
Version 856948c2-da56-11e2-877b-00238b21b463