Updating dependencies, upgrade to rails 4.1
Merge branch 'master' of github.com:HerbCSO/ticketeer

Conflicts:
	.ruby-version
	.travis.yml
	Gemfile
	Gemfile.lock