Proper terminal title handling in zshrc

Conflicts:
	.zshrc
Exclude bower_components in xgrep
Add setup-ubuntu.sh
Fix git status check
Add android sdk stuff in PATH
Merge remote-tracking branch 'origin/master' into imo-dell

Conflicts:
	.zshrc