cleanup
Merge branch 'master' of github.com:Jondeen/openslide-python

Conflicts:
	.gitignore