Liquidprompt
Merge branch 'master' of github.com:auduny/setup

Conflicts:
	.gitmodules
	tools/statpipe