License changes

Add license changes. Merge .gitignore. Update encoding and some whitespace removal.