Revert "Merge branch 'master' of https://github.com/UWPCE-PythonCert/Python300-SystemDevelopmentWithPython-Spring-2014"

This reverts commit d99c67ff3f8d3a1a20aea5acd346ba026c4d011f, reversing
changes made to 130bb1d756888e53f9ea32c86545ccb197bf5f6c.