sync with the Heroku branch

Signed-off-by: Larry Mason <lmason@HungryProgrammer.com>
Merge branch 'master' of https://github.com/RocketHatch/hatchersWeb