Fixed smtp config options
Added bootsy, changed to bootstrap
Removed extraneous mercury file
Integrated bootstrap and bootsy
Merge pull request #10 from bemosior/feature/bem-wysiwyg

Feature/bem wysiwyg