Upgrading ruby to 2.1.5
Updating versions to be removed
Merge branch 'master' into refactor

Merging updating Gemfile and version to ensure stability in new branch