a few changes
Merge branch 'master' of https://github.com/faclc4/YCSB

Conflicts:
	src/main/java/com/yahoo/ycsb/workloads/File_CoreWorkload.java