imac
Merge branch 'master' of https://github.com/muratas/dotfiles

Conflicts:
	.vim/bundle/.neobundle/.netrwhist