script works for any installation directory
use 24h time format
Merge branch 'master' of github.com:maddingo/bash-git-prompt into maddingo-master

Conflicts:
	gitprompt.sh