Fixed more warnings and applied workaround for getting to std::numeric_limits without clashing with Windows' min() and max() macros.

catch.hpp

@@ -67,4 +67,4 @@
 
 using Catch::Approx;
 
-#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED