might switch to ag, seems fast
update
Merge branch 'master' of https://github.com/mellort/dotvim
Merge branch 'master' of https://github.com/mellort/dotvim

Conflicts:
	vimrc