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