Gemfile.lock shouldn't be in repo I believe. Caused me some grief when merging Jack's additions.