update configuration and readme
Merge branch 'master' of https://github.com/tomasc/simple_form_wysihtml

Conflicts:
	README.md