stack-cd related fixes
Merge branch 'master' of github.com:miohtama/ztanesh
Merge branch 'master' of github.com:miohtama/ztanesh
Add Homebrew installation method for OSX
Update README.rst
Update README.rst
Merge pull request #13 from H25/master

Update README to add Homebrew installation method for OSX
Merge branch 'master' of github.com:miohtama/ztanesh
Make OSX locale fix persistent part of dist
Fixed lost tab coloring for the servers
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