We don't need the farbtastic-rails gem anymore
Go to bootstrap-wysihtml5-rails

Conflicts:
	app/assets/javascripts/application.js
Add .bowerrc