better git status line
cleanup
Merge branch 'master' of github.com:jpata/dotfiles

Conflicts:
	.bashrc