Decrease timeout for git in prompt.
Merge branch 'master' of github.com:peplin/dotfiles