Merge pull request #131 from mukkoo/master

resolved conflict
renamed rake task
Merge pull request #132 from wstucco/master

Renamed rake task
Default Style for TinyMCE available tags