update version number
Merge branch 'master' of https://github.com/angstwad/cf

Conflicts:
	setup.py