More fixes for wstool and private repos.
Merge pull request #97 from shadow-robot/B_small_wstool_fix

More fixes for wstool and private repos.