Added path for mac ports
No longer at that job
Updated vim
Merge branch 'master' of https://github.com/dwagon/dotfiles

Conflicts:
	dot_vimrc
	dot_zshrc