Fix for conflicting git completion, added some others.