merge
Merge branch 'reconfiguration' of https://github.com/mettamara/h-store into reconfiguration