make code testable, add tests
Merge branch 'master' of github.com:mnagel/clustergit

Conflicts:
	clustergit