Fixed some shit
Merge branch 'master' of github.com:AmazingDreams/dotfiles

Conflicts:
	.zshrc
Updated submodules