Clean up on import.  Still errors.
Merge branch 'master' of github.com:jsaucier/Perspective