Sync iMac
Merge branch 'master' of gh:benhartley/dotfiles

Conflicts:
	vim/bundle/neobundle.vim