Fix Charm++ setup
Fix to_dat tool
Merge branch 'master' of https://github.com/actor-framework/benchmarks

Conflicts:
	tools/to_dat.cpp