Added NVM backend to AntiCacheDB interface.
Added NVM backend to AntiCacheDB interface.
Added NVM backend to AntiCacheDB
Fixed anticache NVM initialization.
Working on NVM anti-cache backend.
More fixes to anti-cache NVM backend.
Moved anti-cache NVM file allocation to /mnt/pmfs/
Merging branches.
Merged ARIES branch.
More merge conflicts.
Merge remote-tracking branch 'joy/master'
Minor tweaks for benchmarking on NVM emulator.
Merge branch 'master' of https://github.com/jdebrabant/h-store

Conflicts:
	buildtools.py
	experiment.sh
	properties/benchmarks/ycsb.properties
	src/benchmarks/edu/brown/benchmark/ycsb/YCSBConstants.java
	src/frontend/org/voltdb/VoltProcedure.java