Updates to namespaces, other tweaks from VS2013
Namespace updates

Formatting sweep