Implement zip in NRV Futures
Merge pull request #113 from wajam/alex-futures-zip

Implement zip in NRV Futures
Revert "Implement zip in NRV Futures"

This reverts commit 9de7df0e75911452ef1bf7bb4a50d42616fd9884.
Merge pull request #116 from wajam/alex-no-zip

Revert "Implement zip in NRV Futures"
Fix lookup of consistency timestamp for rollover token range
Cleanup
Merge pull request #117 from wajam/manu-current-consistentcy-timestamp-fix

Fix lookup of consistency timestamp for rollover token range
Merge branch 'master' into manu-force-blocking-service-down

Conflicts:
	nrv-core/src/main/scala/com/wajam/nrv/consistency/ConsistencyMasterSlave.scala