Revert Pratik's changes from master

 - Reverting changes made to active admin

 - Going forward I'll deploy to Heroku from a branch and not merge to master until we know it's right.