Highlight the current line
Auto remove trailing tabs/spaces.
Merge branch 'master' of https://github.com/jawrainey/dotfiles

Conflicts:

- .vimrc