Merge branch 'master' of github.com:miohtama/ztanesh
Merge branch 'master' of github.com:miohtama/ztanesh
Merge pull request #14 from H25/master

Misc fixes for OSX installation
Make OSX locale fix persistent part of dist
Fixed lost tab coloring for the servers
Merged master changes
Correcly set path of Macports GNU userland
Started to annotate prompt code
BSD userland fixes. Correctly use Macports et. al.
Shortened syntax for setting dir colors
Added command line highlighitng
Updated README
Adding branch info and root color fix
added .properties the same colors as other inifiles.
fixed a bug in lsx wherein - in group name or such could make it crash
Merge github.com:miohtama/ztanesh

Conflicts:
	README.rst
made more zsh by using [[ $() etc more consistently
merged remote

Merge remote-tracking branch 'remotes/origin/dev'

Conflicts:
	zsh-scripts/rc/65-functions
merged dev branch again.

Merge remote-tracking branch 'remotes/mikkomaster/dev'

Conflicts:
	README.rst
	zsh-scripts/rc/01-detect-os
	zsh-scripts/rc/39-osx-vars
	zsh-scripts/rc/40-vars
	zsh-scripts/rc/65-functions
more cleanups