Swapped to Monokai theme for vim and zsh
Updated README
Merge branch 'master' of github.com:nerdotry/dotfiles

Conflicts:
	vim/.vimrc