Stop using Jeweler and use "bundle gem magician" instead
Move the readme badges down a line
Update version to 0.3.1
Merge branch 'master' into develop
Merge branch 'develop' into feature/no-jeweler

Conflicts:
	README.md
	lib/magician/version.rb