Ack, path, and show status line in vim.
Merge branch 'master' of github.com:luqui/dotfiles

Conflicts:
	.zshrc