Tweaks for smoother running on CIT

Hi Will,
You might want to grab these commits that allow your code to work on python on the CIT cluster, and also reduce the memory usage a little bit more (I was still seeing condor problems).

Cheers,
John