TJ's stuff from last night
Merge branch 'master' of https://github.com/Vector-usu/Tramps