fixed git_prompt issue and move work related settings it's own file
Merge remote-tracking branch 'origin/dev'

Conflicts:
	.zshrc