Merging in Tony's fixes
Merge branch 'master' of https://github.com/birkanu/life-at-mit