Specific config for polok
Merge branch 'master' into polok

Conflicts:
	home/.vimrc
	home/.zshrc
Merge branch 'master' into polok
Merge branch 'master' into polok
Cleaned up Comments in .vimrc
- z from oh-my-zsh plugins