fixed git log aliases, made vim the git editor
Merge branch 'work'
updated vim submod