moving stuff around
Merge branch 'master' of github.com:uberj/inv-tool

Conflicts:
	MANIFEST