Fixes to support engineyard deployment and bugfixes exposed by said deploy.
Includes reverting from ruby 2.1.5 to ruby 2.1.2 to support engineyard tested stack
Merge branch 'master' of ssh://github.com/calacademy/antcat

Removed header code that wasn't used