Added vim-emblem
Merge branch 'master' of github-personal:eriknelson/dotfiles

Conflicts:
	zshrc