Change editor back to vim
Change git alias to improve
Convert tabs to spaces