Revert ".aliases: Don't give ls color aliases on Linux."

This reverts commit 8df5e79dc8bbec7aed966d86b450a33c376e76e8.
Merge branch 'master' of git://github.com/jrunningen/dotfiles

* 'master' of git://github.com/jrunningen/dotfiles:
  vim: Update pathogen.
.vimrc: Set shiftround.
.vimrc: Enable syntax highlighting for Protocol Buffers.
.vimrc: Reclaim the digraph mapping from UltiSnips.
.vimrc: Capitalization consistency.
.vimrc: Add binding to show yankring.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Remove the "ip" alias.
  .vimrc: Disable Tagbar for vim < 7.0.167.