fix git dirty prompt for 1.8. several other modifications
Merge branch 'master' of github.com:morgler/dotfiles

Conflicts:
	dotfiles/bash/aliases
	settings/sublime/Preferences.sublime-settings