fix copyrights and things
Merge commit 'a0bdd409d997e8491dcb12714c9516f9bff06f8a' into rock/geo