Merge branch 'andy' of https://github.com/jacoblwright/hit into jake

Conflicts:
	dist/lib/inventory-tracker.jar
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy

Conflicts:
	dist/lib/inventory-tracker.jar
Commit before Jake pull