Removing unnecessary stuff
Coloring
Default locale
Default cache dirs for less ~/ junk
Completion settings
Some everyday aliases
Merge branch 'master' into osx

Conflicts:
	zsh/20_aliases_autocolor
	zshenv
OSX aliases