added completions and fixed git commit msg loading vi instead of vim

Squashed re-bases