random cleanups
Merge branch 'master' of github.com:pintos2013/pintos