Made compiling work with GCC again.

I really don't appreciate MSVC's terrible c++11 support...
Auto formatting code.