Changes to pass travis
new Gemfile.lock
merged to make Travis happy