Some refactoring and cleanup
Merge branch 'master' of https://github.com/hiranya911/mdcc

Conflicts:
	core/src/main/java/edu/ucsb/cs/mdcc/txn/TestClient.java