Remove Gemfile.lock and bring dependencies in line with best practices

Or at least, "in line with best practices as far as I know understand them":
http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/