make untag script more clever, this should now work on osx and linux, and regardless of the cwd
Merge branch 'master' of github.com:topazproject/topaz

Conflicts:
	bin/untag.sh
whitespace cleanup