Fixed build issues and typos

Also renamed styles to more common names.

mbgl.gyp

@@ -3,7 +3,6 @@
     './gyp/common.gypi',
     './gyp/shaders.gypi',
     './gyp/version.gypi',
-    './gyp/styles.gypi',
     './gyp/certificates.gypi',
     './gyp/standalone.gypi',
     './gyp/core.gypi',

platform/default/default_styles.cpp

@@ -4,12 +4,12 @@ namespace mbgl {
 namespace util {
 
 const std::vector<std::pair<std::string, std::string>> defaultStyles = {
-    { "mapbox://styles/mapbox/streets-v8", "Mapbox Streets" },
+    { "mapbox://styles/mapbox/streets-v8", "Streets" },
     { "mapbox://styles/mapbox/emerald-v8", "Emerald" },
     { "mapbox://styles/mapbox/light-v8", "Light" },
     { "mapbox://styles/mapbox/dark-v8", "Dark" },
     { "mapbox://styles/mapbox/satellite-v8", "Satellite" },
-    { "mapbox://styles/mapbox/satellite-hyrid-v8", "Satellite Streets" },
+    { "mapbox://styles/mapbox/satellite-hybrid-v8", "Hybrid" },
 };
 
 } // end namespace util