Removed 4.5 minute adjustment for Dreamhost server
Merge branch 'dev' into beta