bugz 5126: added os mapping to descriptive names
fix redundant imports
Merge pull request #27 from daniellemayne/2014.08

2014.08 bugz 5126: added os mapping to descriptive names