Making locking optional, cleanup
Add Gemfile
Add travis file