Added zsh config
Let there be colours in vim
Merge branch 'master' of https://github.com/xoliver/configs

Conflicts:
	vimrc