fixed a problem in prepare.sh
added a few scripts and moved them to the scripts subdir
fixed small bugs
fixed stupid properties conflict
made git happy and restored by tpcc properties file
Merge branch 'composite-partitioning' of ssh://github.com/marcoserafini/h-store into composite-partitioning