COMP: Fix warnings in tubeCLIHelperFunctions and cleanup code
Merge pull request #69 from jamiesnape/FixCLIHelperFunctionsWarnings

COMP: Fix warnings in tubeCLIHelperFunctions and cleanup code
COMP: Remove redundant includes