add waffle.io badge
Merge pull request #69 from morgante/inlineRich

Add support for a rich text inline mode
Added keyContexts and a few small bug fixes with placeholder
Merge branch '1.x'

Conflicts:
	docs/partials/options.js
Merge branch 'master' of https://github.com/jakiestfu/Medium.js

Conflicts:
	medium.js
Merge pull request #68 from waffle-iron/master

waffle.io Badge
Getting rid of styles that are not needed, that triggered the massive ugly border in IE.  Add a little tlc that makes IE8 not implode by default.  Fix a url.
Merge branch '1.x'
Merge branch 'master' of https://github.com/jakiestfu/Medium.js

Conflicts:
	medium.js
ie8 support
Merge branch '1.x'
IE8 fixes, simplify examples
Merge branch '1.x'

Conflicts:
	medium.js
Fix borderTopWidth
Merge branch '1.x'
Make destroy remove more, make element clear, but only with css rather than styles directly.  Ensure that placeholder is only removed once rather than on every change.
Merge branch '1.x'
Only add placeholder if needed.   Assist with backspace or delete only when there are contents to do so.
Merge branch '1.x'