unordered map

Some more c++11 features to a different branch to test merge.
Merge remote-tracking branch 'origin/TestBranch0'