add ruby 2.1.0 to travis.yml
Merge branch 'develop' of github.com:ulmic/i_am_the_lider into develop

* 'develop' of github.com:ulmic/i_am_the_lider:
  add ruby 2.1.1 to travis.yml

Conflicts:
	.travis.yml