Stop using Jeweler and use "bundle gem magician" instead
Only install the kramdown gem on JRuby and the redcarpet gem on other Rubies
Merge branch 'develop' into feature/terminal-table

Conflicts:
	Gemfile