Notice the new rails-4 branch in README.
added more allowed tags to wysihtml5 parser rules
Merge branch 'rails-4' of github.com:skomputer/bootsy into rails-4

Conflicts:
	README.md