added vim lion and ag.vim
add $HOME/local paths
Merge branch 'master' of github.com:benjaminfjones/dotfiles

Conflicts:
	zsh/zshrc