Removed unused variable
Merge branch 'master' of github.com:dallingham/regenerate
Convert exceptions to 2.7/3.0 compatible syntax