updated gemfile, ran generators and config edits as needed
untracked changes from previous commit (lol rubymine)