added awesome gems, but in a different order!
Merge branch 'breakinthebuild'

Conflicts:
	Gemfile
Merge branch 'breakinthebuild'

Conflicts:
	Gemfile