removed heroku gem from bundle (it was messing with heroku toolchain. wrapped logic of auto-loading env variables in condition that checks for development environment.
removed FactoryGirl.find_definitions from rakefile
moved FactoryGirl.find_definitions to spec_helper.rb
added testing gems to production env so that we can see fake seed data on website. will remove later
moved debugger out of production
moved Esty config lines in environment.rb
fixed merge conflicts
Merge branch 'master' of https://github.com/mattbarackman/inkwell