Packages fix
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py
fix vcversion setup.py
remove vcversioner because it hates tox and tag release 0.0.1