committing before pulling
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
Fixed thread_unblock to yield on return for an interrupt context