vimdiff color update, alias update
Merge branch 'master' of github.com:mkenney/terminal_config