lots of stuff
Merge branch 'master' of https://github.com/Vector-usu/Tramps