Clean up, updated readme and license info