Merge branch 'master' of git://g.csail.mit.edu/6.824-golabs-2014
Merge branch 'master' of https://github.com/cjosephson/labs
passing all but the very last test (it occastionally fails