Attempt at a git prompt from 20140604
Merge branch 'master' of github.com:aquatix/dotfiles