Update to Ruby 2.1.5
Merge pull request #40 from Tomohiro/ruby-2.1.5
Bundle update 20141230093154
Merge pull request #41 from tachikomapocket/tachikoma/update-20141230093154
Merge branch 'master' into ruby-2.2.0

Conflicts:
	.ruby-version
	.travis.yml
	Gemfile