Petter's MSVC fixes

Change-Id: I13a2f6e1046136ce240c22dadd1b7547f56d4493
diff --git a/internal/ceres/collections_port.h b/internal/ceres/collections_port.h
index a356cc0..063b6d3 100644
--- a/internal/ceres/collections_port.h
+++ b/internal/ceres/collections_port.h
@@ -37,7 +37,7 @@
 #  include <map>
 #  include <set>
 #else
-#  if defined(_MSC_VER) && _MSC_VER <= 1600
+#  if defined(_MSC_VER)
 #    include <unordered_map>
 #    include <unordered_set>
 #  else
diff --git a/internal/ceres/coordinate_descent_minimizer.cc b/internal/ceres/coordinate_descent_minimizer.cc
index 72edfe2..d85601d 100644
--- a/internal/ceres/coordinate_descent_minimizer.cc
+++ b/internal/ceres/coordinate_descent_minimizer.cc
@@ -30,6 +30,7 @@
 
 #include "ceres/coordinate_descent_minimizer.h"
 
+#include <iterator>
 #include <numeric>
 #include <vector>
 #include "ceres/evaluator.h"