Merging presentation branch

Updating master to match the material presented at CppCon14