prevent dirty tree from resulting in a nice version number
make sure Michael can build a non -dirty version
Merge pull request #353 from Incubaid/dirty-tag

prevent dirty tree from resulting in a nice version number
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/paxos/multi_paxos_fsm.ml
Merge pull request #358 from Incubaid/1.6-for-1.7

1.6 for 1.7