Bump to Ruby 2.1.1
Merge branch 'master' of github.com:rails-girls-summer-of-code/rgsoc-teams

Conflicts:
	.travis.yml