onsite room things
Merge branch 'master' of https://github.com/kmorrison/caltech into fix_timezones