Minor changes to be compatible with Python 2.6.6 (apparently this is what runs on the Brandeis machines >_<)