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