Switch to using better bundler conventions

[rmm5t]

See http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/

[chriseppstein]

I added this on master and also gitignored the Gemfile.lock. Thanks for the nudge.