hours fixes 5/29/14
Merge branch 'summer-hours-fixes' into prod