Bump
Merge branch 'master' of github.com:pikesley/badger

Conflicts:
	lib/badger/version.rb