Cleaned up licenses / copyright. Thanks to Oreolek for the advice.
Merged with remote master.