Initial v1.0 checkin with PyPi metadata.
fix merge issues
Fix license name