increment version number to v0.10
Merge remote branch 'origin/master'

Conflicts:
	setup.py