Add gitignore and delete Gemfile.lock
Merge branch 'master' into relation-mapping-support