Update Travis Yaml
Merge branch 'feature/add_ruby_2_1_0' of https://github.com/petergoldstein/acts_as_votable into petergoldstein-feature/add_ruby_2_1_0

Conflicts:
	.travis.yml