python 2.6 fixes, and actually run stock tests
Merge pull request #198 from dimagi/python26

python 2.6 fixes, and actually run stock tests