openshift not happy
Merge branch 'master' of https://github.com/brotherclone/imaginary

Conflicts:
	config/initializers/assets.rb