Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit f6ca8d3f6fdc170d9f65890661850f850f5dc6cb, reversing
changes made to f7cf78888c5922ca8ba34f845b6c0ca87dcb5597.

Conflicts:
	dist/wysihtml5-0.3.0_rc2.js
	dist/wysihtml5-0.4.0pre.min.js
wysihtml5 merge foobar.