About to pull
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
Changed where we called swap_init. WARNING: extra debugging printfs