Ignore .lock files
Modify to make Rails 4 tests pass