Merge branch 'develop'
Fixed problem with jruby not liking redcarpet by using maruku. Run specs against 1.9, jruby and rbx and all pass so if TravisCI doesn't like this, it's too bad.
Merge branch 'master' into develop