Removing some Python 2.6 support and cleaning up some exceptions
Merge branch 'cleanup'
Merging cleanup into master