version bump
update gitignore
stop testing against master and tox config

Conflicts:
	tox.ini