Merge branch 'master' of http://github.com/FruitieX/dotfiles

Conflicts:
	.vim/bundle/vim-easymotion.git
	.zshrc
Merge branch 'master' into servy