Update README.md
Update CONTRIBUTING.md
version bump
Merge remote-tracking branch 'origin/master' into devise

Conflicts:
	lib/auth_processor.rb