small updates
Merge branch 'master' of https://github.com/creack/dotfiles

Conflicts:
	dot.gitconfig
Add smarty git prompt to zsh