Rename license for easier identification, fix a regression with python 2 compatibility