Fixed up command line unit test
Merge branch 'master' of https://github.com/socsieng/tsutil

Conflicts: