Merge branch 'focus/cpp-ast-refactor' of https://github.com/DaMSL/K3-Core into focus/cpp-ast-refactor
Qualify std map. Add using std::make_tuple