Expirementing with adding zsh support
Fixing completion issues
Merge branch 'master' into develop
BEtter zsh/bash settings
Set default paths for macos
Minor edits
Moved prompt setting to a separate function for zshrc
Added tmux configuration
Merge branch 'develop' of github.com:dreamiurg/bash-ext into develop

Conflicts:
	zshrc
Merged
More fixes
better paths for mac
Modifications
Local mods
Merge branch 'develop' of github.com:dreamiurg/bash-ext into develop

Conflicts:
	vimrc
Force sh syntax highlight for .localsettings