update bundles and ruby to 2.1.5
Merge branch 'master' into start_season_2014

Conflicts:
	Gemfile.lock