bump version
Merge branch 'master' into py2

Conflicts:
	setup.py
add license text
Merge branch 'master' into py2