bundle update
bump ruby to 2.1.5
test fixes
Merge pull request #197 from zendesk/sdavidovitz/bump_v

Bump ruby versions + Gemfile.lock