Proper terminal title handling in zshrc

Conflicts:
	.zshrc
Exclude bower_components in xgrep
Add setup-ubuntu.sh
Fix git status check
Merge branch 'master' into imo-desk

Conflicts:
	.zshrc