Merge branch 'master' of ssh+git://caffeine.uwaterloo.ca/srv/git/public/pyceo