Reverted changes that seemed to slow down Vim
Add Mac aliases
Add color column