fix copyrights and things
Merge commit '25839757b5abca6ed6147d12bd3ab9694ea63fc8' into rock/bridge-doctrine