Merged in joy's branch.
Merged in joy's branch. Removed hardcoded nvm directory.
Replace clock_get_time in debuglog
Merge branch 'master' of https://github.com/jdebrabant/h-store