Upgrades Ruby to 2.1.2
Update travis config with ruby version
Merge branch 'master' into chores/upgrade-ruby-2.1.2

Conflicts:
	.travis.yml
Merge branch 'chores/upgrade-ruby-2.1.2'