Heroku fix (I think?)
Merge branch 'master' of github.com:allynfolksjr/Celluloid

Conflicts:
	config/application.rb