Merge branch 'master' of github.com:hhanh/dotfiles
source git-prompt and git-completion in Mac OS X