We should all enjoy git

This commit wants to join the upstream. Please merge and add stuff.