removed Gemfile.lock from repository as per http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
sensible .gitignore that matches bundler created one
Merge branch 'bug-gemfile-lock'