Move the readme badges down a line
Update the code climate badge
Update rdoc and redcarpet
Merge branch 'master' into no-jeweler

Conflicts:
	Gemfile
	README.md