check in some shonky short-term hacks...
Merge branch 'master' of github.com:straup/youarehere