grep -> ack
page up/down H/L
more flexible gfm code highlight
Merge branch 'master' of github.com:aaren/dotvim

Conflicts:
	vimrc