ack shortcut
Merge branch '3.0' of github.com:jonaustin/spf13-vim into 3.0

* '3.0' of github.com:jonaustin/spf13-vim:
  stronger encryption with vim -x and prettier linebreaks
  :Sudo alias
  csv.vim and tpope
  fix folding

Conflicts:
	.vimrc.local