sync store before closing tlog
Merlin file
Enable compiler warnings and fix resulting errors
Remove unneeded merlin dependencies
Merge pull request #454 from mark-christiaens/1.6_merlin

1.6 merlin
Add `B _build/src/node` to `.merlin`
Merge pull request #448 from lienboe/1.6.fix_warnings

Enable & fixup compiler warnings.
Merge #450 branch 'incubaid-sync-store' into incubaid-1.6

Conflicts:
	src/node/local_store.ml
	src/node/mem_store.ml
Merge branch 'incubaid-1.6' into masterless

Conflicts:
	src/node/mem_store.ml
	src/paxos/slave.ml
	src/system/drop_master.ml