make hash multi table compile with new changes
fix a merge of join/CMakeLists.txt that got overwritten
Merge branch 'master' of github.com:nelsonje/grappa-private