quickfix

Consolidate files for easier package maintenance

Important note for these changes: by changing the exception catching behavior,
this will only support Python 2.6+ and Python 3+.  The same files can then be
deployed in the package, and only different flags need to be passed down for
compilation.