bump version
Merge branch 'master' of github.com:gregbanks/deltaburke

Conflicts:
	deltaburke/_version.py