Update vimrc with ag and some other cool stuff
Merge branch 'master' of github.com:franciscoj/dot-files

Conflicts:
	gvimrc/vimrc