Added cygwin
Added defiant
Merge branch 'master' of github.com:K-4U/Configs

Conflicts:
	zsh/.zshrc