st3 updates
Merge branch 'master' of github.com:dskinner/PackageMeta

Conflicts:
	packagemeta.py