revert merge with master
Merge branch 'master' into materialiser_fix

Conflicts:
	include/floppy.hrl
	src/clocksi_downstream.erl
	src/clocksi_materializer.erl
	src/clocksi_readitem_fsm.erl
	src/clocksi_vnode.erl
	src/inter_dc_repl_update.erl
	src/materializer_vnode.erl
fixed bugs that were not letting some tests pass