some cleanup and formating
Merge branch 'master' of github:nhetrick/MachineShop