Update license, readme, and gitignore
Weird merge...