Removed 4.5 minute adjustment for Dreamhost server
Merge branch 'dev' into beta
Changed dreamhost time adjustment to 40 seconds
Merge branch 'dev' into beta
Merge branch 'beta'