Parameterize file location
Multi partition on single site
ARIES works in all configurations !
Merge branch 'aries-mp'

Conflicts:
	src/ee/execution/VoltDBEngine.cpp
	src/ee/execution/VoltDBEngine.h
	src/ee/logging/AriesLogProxy.cpp
	src/ee/voltdbjni.cpp
	src/frontend/edu/brown/hstore/HStoreSite.java
	src/frontend/edu/brown/hstore/PartitionExecutor.java
	tests/frontend/org/voltdb/regressionsuites/TestSnapshotRecovery.java