Update Settings (Sublime, ITerm) and Bashprompt
Merge branch 'master' of github.com:mortik/dot-files

Conflicts:
	com.googlecode.iterm2.plist
	sublime/Preferences.sublime-settings