add git aliases; diffmerge as diff/merge tool
vim: bundle, font changes
vim: menu max items
vim: python, pymode changes