Fix range selection in IE8
Merge user options with defaults rather than override them
Merge branch 'master' of github.com:tilleryd/bootstrap-wysiwyg

Changes by @tilleryd to match #99 "Fix range selection in IE8"