Override builtins again
Make git-refresh handle missing upstreams
Add hooks for cmd-key-happy