Revert "Revert "C++11 Fixes: Part 1.""

This reverts commit 3883f29dc6ed05890acb7d6f6563790d3de998cc.

Apparently that didn't fix it like I thought it would...