Fix up git repository
Back-merge some stuff from the internal version
Add license