diff --git a/binding.gyp b/binding.gyp
index fb11ab38..525a1c5f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,57 +1,55 @@
 {
-    "targets": [{
-      "target_name": "leveldown"
-    , "conditions": [
-          ["OS == 'win'", {
-              "defines": [
-                  "_HAS_EXCEPTIONS=0"
-              ]
-            , "msvs_settings": {
-                  "VCCLCompilerTool": {
-                      "RuntimeTypeInfo": "false"
-                    , "EnableFunctionLevelLinking": "true"
-                    , "ExceptionHandling": "2"
-                    , "DisableSpecificWarnings": [ "4355", "4530" ,"4267", "4244", "4506" ]
-                  }
-              }
-          }]
-        , ['OS == "linux"', {
-              'cflags': [
-              ]
-            , 'cflags!': [ '-fno-tree-vrp']
-          }]
-        , ['OS == "android"', {
-              'cflags': [ '-fPIC' ]
-            , 'ldflags': [ '-fPIC' ]
-            , 'cflags!': [
-                  '-fno-tree-vrp'
-                , '-fno-exceptions'
-                , '-mfloat-abi=hard'
-                , '-fPIE'
-              ]
-            , 'cflags_cc!': [ '-fno-exceptions' ]
-            , 'ldflags!': [ '-fPIE' ]
-          }]
-        , ['target_arch == "arm"', {
-              'cflags': [ '-mfloat-abi=hard'
-              ]
-          }]
-        ]
-      , "dependencies": [
-            "<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb"
-        ]
-      , "include_dirs"  : [
-            "<!(node -e \"require('nan')\")"
-        ]
-      , "sources": [
-            "src/batch.cc"
-          , "src/batch_async.cc"
-          , "src/database.cc"
-          , "src/database_async.cc"
-          , "src/iterator.cc"
-          , "src/iterator_async.cc"
-          , "src/leveldown.cc"
-          , "src/leveldown_async.cc"
-        ]
-    }]
+  "targets": [{
+    "target_name": "leveldown",
+    "conditions": [
+      ["OS == 'win'", {
+        "defines": [
+          "_HAS_EXCEPTIONS=0"
+        ],
+        "msvs_settings": {
+          "VCCLCompilerTool": {
+            "RuntimeTypeInfo": "false",
+            "EnableFunctionLevelLinking": "true",
+            "ExceptionHandling": "2",
+            "DisableSpecificWarnings": [ "4355", "4530" ,"4267", "4244", "4506" ]
+          }
+        }
+      }],
+      ["OS == 'linux'", {
+        "cflags": [],
+        "cflags!": [ "-fno-tree-vrp"]
+      }],
+      ["OS == 'android'", {
+        "cflags": [ "-fPIC" ],
+        "ldflags": [ "-fPIC" ],
+        "cflags!": [
+          "-fno-tree-vrp",
+          "-fno-exceptions",
+          "-mfloat-abi=hard",
+          "-fPIE"
+        ],
+        "cflags_cc!": [ "-fno-exceptions" ],
+        "ldflags!": [ "-fPIE" ]
+      }],
+      ["target_arch == 'arm'", {
+        "cflags": [ "-mfloat-abi=hard" ]
+      }]
+    ],
+    "dependencies": [
+      "<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb"
+    ],
+    "include_dirs"  : [
+      "<!(node -e \"require('nan')\")"
+    ],
+    "sources": [
+      "src/batch.cc",
+      "src/batch_async.cc",
+      "src/database.cc",
+      "src/database_async.cc",
+      "src/iterator.cc",
+      "src/iterator_async.cc",
+      "src/leveldown.cc",
+      "src/leveldown_async.cc"
+    ]
+  }]
 }
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 5ee7e8db..cb2f9870 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -1,271 +1,272 @@
-{'targets': [{
-    'target_name': 'leveldb'
-  , 'variables': {
-        'ldbversion': '1.20'
-    }
-  , 'type': 'static_library'
-    # Overcomes an issue with the linker and thin .a files on SmartOS
-  , 'standalone_static_library': 1
-  , 'dependencies': [
-        '../snappy/snappy.gyp:snappy'
-    ]
-  , 'direct_dependent_settings': {
-        'include_dirs': [
-            'leveldb-<(ldbversion)/include/'
-          , 'leveldb-<(ldbversion)/port/'
-          , 'leveldb-<(ldbversion)/util'
-          , 'leveldb-<(ldbversion)/'
-        ]
-    }
-  , 'defines': [
-        'SNAPPY=1'
-    ]
-  , 'include_dirs': [
-        'leveldb-<(ldbversion)/'
-      , 'leveldb-<(ldbversion)/include/'
-    ]
-  , 'conditions': [
-        ['OS == "win"', {
-            'conditions': [
-                ['MSVS_VERSION != "2015" and MSVS_VERSION != "2013"', {
-                     'include_dirs': [ 'leveldb-<(ldbversion)/port/win' ]
-                }]
-            ],
-            'include_dirs': [
-                'port-libuv/'
-            ]
-          , 'defines': [
-                'LEVELDB_PLATFORM_UV=1'
-              , 'NOMINMAX=1'
-              , '_HAS_EXCEPTIONS=0'
-            ]
-          , 'sources': [
-                'port-libuv/port_uv.cc'
-              , 'port-libuv/env_win.cc'
-              , 'port-libuv/win_logger.cc'
-            ]
-          , 'msvs_settings': {
-                'VCCLCompilerTool': {
-                    'RuntimeTypeInfo': 'false'
-                  , 'EnableFunctionLevelLinking': 'true'
-                  , 'ExceptionHandling': '2'
-                  , 'DisableSpecificWarnings': [ '4355', '4530' ,'4267', '4244' ]
-                }
-            }
-        }, { # OS != "win"
-            'sources': [
-                'leveldb-<(ldbversion)/port/port_posix.cc'
-              , 'leveldb-<(ldbversion)/port/port_posix.h'
-              , 'leveldb-<(ldbversion)/util/env_posix.cc'
-            ]
-          , 'defines': [
-                'LEVELDB_PLATFORM_POSIX=1'
-            ]
-          , 'ccflags': [
-                '-fno-builtin-memcmp'
-              , '-fPIC'
-            ]
-          , 'cflags': [ '-std=c++0x' ]
-          , 'cflags!': [ '-fno-tree-vrp' ]
-        }]
-      , ['OS != "win"' and 'OS != "freebsd"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-but-set-variable'
-            ]
-        }]
-      , ['OS == "linux"', {
-            'defines': [
-                'OS_LINUX=1'
-            ]
-          , 'libraries': [
-                '-lpthread'
-            ]
-          , 'ccflags': [
-                '-pthread'
-            ]
-        }]
-      , ['OS == "freebsd"', {
-            'defines': [
-                'OS_FREEBSD=1'
-              , '_REENTRANT=1'
-            ]
-          , 'libraries': [
-                '-lpthread'
-            ]
-          , 'ccflags': [
-                '-pthread'
-            ]
-          , 'cflags': [
-                '-Wno-sign-compare'
-            ]
-        }]
-      , ['OS == "openbsd"', {
-            'defines': [
-                'OS_OPENBSD=1'
-              , '_REENTRANT=1'
-            ]
-          , 'libraries': [
-                '-lpthread'
-            ]
-          , 'ccflags': [
-                '-pthread'
-            ]
-          , 'cflags': [
-                '-Wno-sign-compare'
-            ]
-        }]
-      , ['OS == "solaris"', {
-            'defines': [
-                'OS_SOLARIS=1'
-              , '_REENTRANT=1'
-            ]
-          , 'libraries': [
-                '-lrt'
-              , '-lpthread'
-            ]
-          , 'ccflags': [
-                '-pthread'
-            ]
-        }]      
-      , ['OS == "ios"', {
-            'defines': [
-                'OS_IOS=1'
-            ]
-          , 'libraries': []
-          , 'ccflags': []
-          , 'xcode_settings': {
-                'WARNING_CFLAGS': [
-                    '-Wno-sign-compare'
-                  , '-Wno-unused-variable'
-                  , '-Wno-unused-function'
-                ]
-            }
-        }]
-      , ['OS == "mac"', {
-            'defines': [
-                'OS_MACOSX=1'
-            ]
-          , 'libraries': []
-          , 'ccflags': []
-          , 'xcode_settings': {
-                'WARNING_CFLAGS': [
-                    '-Wno-sign-compare'
-                  , '-Wno-unused-variable'
-                  , '-Wno-unused-function'
-                ]
-            }
-        }]
-      , ['OS == "android"', {
-           'defines': [
-                'OS_ANDROID=1'
-              , '_REENTRANT=1'
-            ]
-          , 'libraries': [
-                '-lpthread'
-            ]
-          , 'ccflags': [
-                '-pthread',
-                '-fno-builtin-memcmp',
-                '-fexceptions'
-            ]
-          , 'cflags': [
-                '-fPIC'
-            ]
-          , 'cflags!': [
-                '-fno-exceptions'
-              , '-fPIE'
-              , '-mfloat-abi=hard'
-              , '-Wno-unused-but-set-variable'
-            ]
-          , 'cflags_cc!': [ '-fno-exceptions' ]
-        }]
-      , ['target_arch == "arm"', {
-            'cflags': [
-          '-mfloat-abi=hard'
+{
+  "targets": [{
+    "target_name": "leveldb",
+    "variables": {
+      "ldbversion": "1.20"
+    },
+    "type": "static_library",
+    "standalone_static_library": 1,
+    "dependencies": [
+      "../snappy/snappy.gyp:snappy"
+    ],
+    "direct_dependent_settings": {
+      "include_dirs": [
+        "leveldb-<(ldbversion)/include/",
+        "leveldb-<(ldbversion)/port/",
+        "leveldb-<(ldbversion)/util",
+        "leveldb-<(ldbversion)/"
       ]
-        }]
-    ]
-  , 'sources': [
-        'leveldb-<(ldbversion)/db/builder.cc'
-      , 'leveldb-<(ldbversion)/db/builder.h'
-      , 'leveldb-<(ldbversion)/db/db_impl.cc'
-      , 'leveldb-<(ldbversion)/db/db_impl.h'
-      , 'leveldb-<(ldbversion)/db/db_iter.cc'
-      , 'leveldb-<(ldbversion)/db/db_iter.h'
-      , 'leveldb-<(ldbversion)/db/filename.cc'
-      , 'leveldb-<(ldbversion)/db/filename.h'
-      , 'leveldb-<(ldbversion)/db/dbformat.cc'
-      , 'leveldb-<(ldbversion)/db/dbformat.h'
-      , 'leveldb-<(ldbversion)/db/log_format.h'
-      , 'leveldb-<(ldbversion)/db/log_reader.cc'
-      , 'leveldb-<(ldbversion)/db/log_reader.h'
-      , 'leveldb-<(ldbversion)/db/log_writer.cc'
-      , 'leveldb-<(ldbversion)/db/log_writer.h'
-      , 'leveldb-<(ldbversion)/db/memtable.cc'
-      , 'leveldb-<(ldbversion)/db/memtable.h'
-      , 'leveldb-<(ldbversion)/db/repair.cc'
-      , 'leveldb-<(ldbversion)/db/skiplist.h'
-      , 'leveldb-<(ldbversion)/db/snapshot.h'
-      , 'leveldb-<(ldbversion)/db/table_cache.cc'
-      , 'leveldb-<(ldbversion)/db/table_cache.h'
-      , 'leveldb-<(ldbversion)/db/version_edit.cc'
-      , 'leveldb-<(ldbversion)/db/version_edit.h'
-      , 'leveldb-<(ldbversion)/db/version_set.cc'
-      , 'leveldb-<(ldbversion)/db/version_set.h'
-      , 'leveldb-<(ldbversion)/db/write_batch.cc'
-      , 'leveldb-<(ldbversion)/db/write_batch_internal.h'
-      , 'leveldb-<(ldbversion)/helpers/memenv/memenv.cc'
-      , 'leveldb-<(ldbversion)/helpers/memenv/memenv.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/cache.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/comparator.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/db.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/dumpfile.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/env.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/filter_policy.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/iterator.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/options.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/slice.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/status.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/table.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/table_builder.h'
-      , 'leveldb-<(ldbversion)/include/leveldb/write_batch.h'
-      , 'leveldb-<(ldbversion)/port/port.h'
-      , 'leveldb-<(ldbversion)/port/port_posix_sse.cc'
-      , 'leveldb-<(ldbversion)/table/block.cc'
-      , 'leveldb-<(ldbversion)/table/block.h'
-      , 'leveldb-<(ldbversion)/table/block_builder.cc'
-      , 'leveldb-<(ldbversion)/table/block_builder.h'
-      , 'leveldb-<(ldbversion)/table/filter_block.cc'
-      , 'leveldb-<(ldbversion)/table/filter_block.h'
-      , 'leveldb-<(ldbversion)/table/format.cc'
-      , 'leveldb-<(ldbversion)/table/format.h'
-      , 'leveldb-<(ldbversion)/table/iterator.cc'
-      , 'leveldb-<(ldbversion)/table/iterator_wrapper.h'
-      , 'leveldb-<(ldbversion)/table/merger.cc'
-      , 'leveldb-<(ldbversion)/table/merger.h'
-      , 'leveldb-<(ldbversion)/table/table.cc'
-      , 'leveldb-<(ldbversion)/table/table_builder.cc'
-      , 'leveldb-<(ldbversion)/table/two_level_iterator.cc'
-      , 'leveldb-<(ldbversion)/table/two_level_iterator.h'
-      , 'leveldb-<(ldbversion)/util/arena.cc'
-      , 'leveldb-<(ldbversion)/util/arena.h'
-      , 'leveldb-<(ldbversion)/util/bloom.cc'
-      , 'leveldb-<(ldbversion)/util/cache.cc'
-      , 'leveldb-<(ldbversion)/util/coding.cc'
-      , 'leveldb-<(ldbversion)/util/coding.h'
-      , 'leveldb-<(ldbversion)/util/comparator.cc'
-      , 'leveldb-<(ldbversion)/util/crc32c.cc'
-      , 'leveldb-<(ldbversion)/util/crc32c.h'
-      , 'leveldb-<(ldbversion)/util/env.cc'
-      , 'leveldb-<(ldbversion)/util/filter_policy.cc'
-      , 'leveldb-<(ldbversion)/util/hash.cc'
-      , 'leveldb-<(ldbversion)/util/hash.h'
-      , 'leveldb-<(ldbversion)/util/logging.cc'
-      , 'leveldb-<(ldbversion)/util/logging.h'
-      , 'leveldb-<(ldbversion)/util/mutexlock.h'
-      , 'leveldb-<(ldbversion)/util/options.cc'
-      , 'leveldb-<(ldbversion)/util/random.h'
-      , 'leveldb-<(ldbversion)/util/status.cc'
+    },
+    "defines": [
+      "SNAPPY=1"
+    ],
+    "include_dirs": [
+      "leveldb-<(ldbversion)/",
+      "leveldb-<(ldbversion)/include/"
+    ],
+    "conditions": [
+      ["OS == 'win'", {
+        "conditions": [
+          ["MSVS_VERSION != '2015' and MSVS_VERSION != '2013'", {
+            "include_dirs": [ "leveldb-<(ldbversion)/port/win" ]
+          }]
+        ],
+        "include_dirs": [
+          "port-libuv/"
+        ],
+        "defines": [
+          "LEVELDB_PLATFORM_UV=1",
+          "NOMINMAX=1",
+          "_HAS_EXCEPTIONS=0"
+        ],
+        "sources": [
+          "port-libuv/port_uv.cc",
+          "port-libuv/env_win.cc",
+          "port-libuv/win_logger.cc"
+        ],
+        "msvs_settings": {
+          "VCCLCompilerTool": {
+            "RuntimeTypeInfo": "false",
+            "EnableFunctionLevelLinking": "true",
+            "ExceptionHandling": "2",
+            "DisableSpecificWarnings": [ "4355", "4530" ,"4267", "4244" ]
+          }
+        }
+      }, {
+        "sources": [
+          "leveldb-<(ldbversion)/port/port_posix.cc",
+          "leveldb-<(ldbversion)/port/port_posix.h",
+          "leveldb-<(ldbversion)/util/env_posix.cc"
+        ],
+        "defines": [
+          "LEVELDB_PLATFORM_POSIX=1"
+        ],
+        "ccflags": [
+          "-fno-builtin-memcmp",
+          "-fPIC"
+        ],
+        "cflags": [ "-std=c++0x" ],
+        "cflags!": [ "-fno-tree-vrp" ]
+      }],
+      ["OS != 'win'" and "OS != 'freebsd'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-Wno-unused-but-set-variable"
+        ]
+      }],
+      ["OS == 'linux'", {
+        "defines": [
+          "OS_LINUX=1"
+        ],
+        "libraries": [
+          "-lpthread"
+        ],
+        "ccflags": [
+          "-pthread"
+        ]
+      }],
+      ["OS == 'freebsd'", {
+        "defines": [
+          "OS_FREEBSD=1",
+          "_REENTRANT=1"
+        ],
+        "libraries": [
+          "-lpthread"
+        ],
+        "ccflags": [
+          "-pthread"
+        ],
+        "cflags": [
+          "-Wno-sign-compare"
+        ]
+      }],
+      ["OS == 'openbsd'", {
+        "defines": [
+          "OS_OPENBSD=1",
+          "_REENTRANT=1"
+        ],
+        "libraries": [
+          "-lpthread"
+        ],
+        "ccflags": [
+          "-pthread"
+        ],
+        "cflags": [
+          "-Wno-sign-compare"
+        ]
+      }],
+      ["OS == 'solaris'", {
+        "defines": [
+          "OS_SOLARIS=1",
+          "_REENTRANT=1"
+        ],
+        "libraries": [
+          "-lrt",
+          "-lpthread"
+        ],
+        "ccflags": [
+          "-pthread"
+        ]
+      }],
+      ["OS == 'ios'", {
+        "defines": [
+          "OS_IOS=1"
+        ],
+        "libraries": [],
+        "ccflags": [],
+        "xcode_settings": {
+          "WARNING_CFLAGS": [
+            "-Wno-sign-compare",
+            "-Wno-unused-variable",
+            "-Wno-unused-function"
+          ]
+        }
+      }],
+      ["OS == 'mac'", {
+        "defines": [
+          "OS_MACOSX=1"
+        ],
+        "libraries": [],
+        "ccflags": [],
+        "xcode_settings": {
+          "WARNING_CFLAGS": [
+            "-Wno-sign-compare",
+            "-Wno-unused-variable",
+            "-Wno-unused-function"
+          ]
+        }
+      }],
+      ["OS == 'android'", {
+        "defines": [
+          "OS_ANDROID=1",
+          "_REENTRANT=1"
+        ],
+        "libraries": [
+          "-lpthread"
+        ],
+        "ccflags": [
+          "-pthread",
+          "-fno-builtin-memcmp",
+          "-fexceptions"
+        ],
+        "cflags": [
+          "-fPIC"
+        ],
+        "cflags!": [
+          "-fno-exceptions",
+          "-fPIE",
+          "-mfloat-abi=hard",
+          "-Wno-unused-but-set-variable"
+        ],
+        "cflags_cc!": [ "-fno-exceptions" ]
+      }],
+      ["target_arch == 'arm'", {
+        "cflags": [
+          "-mfloat-abi=hard"
+        ]
+      }]
+    ],
+    "sources": [
+      "leveldb-<(ldbversion)/db/builder.cc",
+      "leveldb-<(ldbversion)/db/builder.h",
+      "leveldb-<(ldbversion)/db/db_impl.cc",
+      "leveldb-<(ldbversion)/db/db_impl.h",
+      "leveldb-<(ldbversion)/db/db_iter.cc",
+      "leveldb-<(ldbversion)/db/db_iter.h",
+      "leveldb-<(ldbversion)/db/filename.cc",
+      "leveldb-<(ldbversion)/db/filename.h",
+      "leveldb-<(ldbversion)/db/dbformat.cc",
+      "leveldb-<(ldbversion)/db/dbformat.h",
+      "leveldb-<(ldbversion)/db/log_format.h",
+      "leveldb-<(ldbversion)/db/log_reader.cc",
+      "leveldb-<(ldbversion)/db/log_reader.h",
+      "leveldb-<(ldbversion)/db/log_writer.cc",
+      "leveldb-<(ldbversion)/db/log_writer.h",
+      "leveldb-<(ldbversion)/db/memtable.cc",
+      "leveldb-<(ldbversion)/db/memtable.h",
+      "leveldb-<(ldbversion)/db/repair.cc",
+      "leveldb-<(ldbversion)/db/skiplist.h",
+      "leveldb-<(ldbversion)/db/snapshot.h",
+      "leveldb-<(ldbversion)/db/table_cache.cc",
+      "leveldb-<(ldbversion)/db/table_cache.h",
+      "leveldb-<(ldbversion)/db/version_edit.cc",
+      "leveldb-<(ldbversion)/db/version_edit.h",
+      "leveldb-<(ldbversion)/db/version_set.cc",
+      "leveldb-<(ldbversion)/db/version_set.h",
+      "leveldb-<(ldbversion)/db/write_batch.cc",
+      "leveldb-<(ldbversion)/db/write_batch_internal.h",
+      "leveldb-<(ldbversion)/helpers/memenv/memenv.cc",
+      "leveldb-<(ldbversion)/helpers/memenv/memenv.h",
+      "leveldb-<(ldbversion)/include/leveldb/cache.h",
+      "leveldb-<(ldbversion)/include/leveldb/comparator.h",
+      "leveldb-<(ldbversion)/include/leveldb/db.h",
+      "leveldb-<(ldbversion)/include/leveldb/dumpfile.h",
+      "leveldb-<(ldbversion)/include/leveldb/env.h",
+      "leveldb-<(ldbversion)/include/leveldb/filter_policy.h",
+      "leveldb-<(ldbversion)/include/leveldb/iterator.h",
+      "leveldb-<(ldbversion)/include/leveldb/options.h",
+      "leveldb-<(ldbversion)/include/leveldb/slice.h",
+      "leveldb-<(ldbversion)/include/leveldb/status.h",
+      "leveldb-<(ldbversion)/include/leveldb/table.h",
+      "leveldb-<(ldbversion)/include/leveldb/table_builder.h",
+      "leveldb-<(ldbversion)/include/leveldb/write_batch.h",
+      "leveldb-<(ldbversion)/port/port.h",
+      "leveldb-<(ldbversion)/port/port_posix_sse.cc",
+      "leveldb-<(ldbversion)/table/block.cc",
+      "leveldb-<(ldbversion)/table/block.h",
+      "leveldb-<(ldbversion)/table/block_builder.cc",
+      "leveldb-<(ldbversion)/table/block_builder.h",
+      "leveldb-<(ldbversion)/table/filter_block.cc",
+      "leveldb-<(ldbversion)/table/filter_block.h",
+      "leveldb-<(ldbversion)/table/format.cc",
+      "leveldb-<(ldbversion)/table/format.h",
+      "leveldb-<(ldbversion)/table/iterator.cc",
+      "leveldb-<(ldbversion)/table/iterator_wrapper.h",
+      "leveldb-<(ldbversion)/table/merger.cc",
+      "leveldb-<(ldbversion)/table/merger.h",
+      "leveldb-<(ldbversion)/table/table.cc",
+      "leveldb-<(ldbversion)/table/table_builder.cc",
+      "leveldb-<(ldbversion)/table/two_level_iterator.cc",
+      "leveldb-<(ldbversion)/table/two_level_iterator.h",
+      "leveldb-<(ldbversion)/util/arena.cc",
+      "leveldb-<(ldbversion)/util/arena.h",
+      "leveldb-<(ldbversion)/util/bloom.cc",
+      "leveldb-<(ldbversion)/util/cache.cc",
+      "leveldb-<(ldbversion)/util/coding.cc",
+      "leveldb-<(ldbversion)/util/coding.h",
+      "leveldb-<(ldbversion)/util/comparator.cc",
+      "leveldb-<(ldbversion)/util/crc32c.cc",
+      "leveldb-<(ldbversion)/util/crc32c.h",
+      "leveldb-<(ldbversion)/util/env.cc",
+      "leveldb-<(ldbversion)/util/filter_policy.cc",
+      "leveldb-<(ldbversion)/util/hash.cc",
+      "leveldb-<(ldbversion)/util/hash.h",
+      "leveldb-<(ldbversion)/util/logging.cc",
+      "leveldb-<(ldbversion)/util/logging.h",
+      "leveldb-<(ldbversion)/util/mutexlock.h",
+      "leveldb-<(ldbversion)/util/options.cc",
+      "leveldb-<(ldbversion)/util/random.h",
+      "leveldb-<(ldbversion)/util/status.cc"
     ]
-}]}
+  }]
+}
diff --git a/deps/snappy/snappy.gyp b/deps/snappy/snappy.gyp
index d369254f..c123f1ed 100644
--- a/deps/snappy/snappy.gyp
+++ b/deps/snappy/snappy.gyp
@@ -1,105 +1,106 @@
-{'targets': [{
-    'variables': {
-        'conditions': [
-            ['OS=="linux"',   {'os_include': 'linux'}]
-          , ['OS=="android"', {'os_include': 'linux'}]
-          , ['OS=="ios"',     {'os_include': 'mac'}]
-          , ['OS=="mac"',     {'os_include': 'mac'}]
-          , ['OS=="solaris"', {'os_include': 'solaris'}]
-          , ['OS=="win"',     {'os_include': 'win32'}]
-          , ['OS=="freebsd"', {'os_include': 'freebsd'}]
-          , ['OS=="openbsd"', {'os_include': 'openbsd'}]
+{
+  "targets": [{
+    "variables": {
+      "conditions": [
+        ["OS=='linux'",   {"os_include": "linux"}],
+        ["OS=='android'", {"os_include": "linux"}],
+        ["OS=='ios'",     {"os_include": "mac"}],
+        ["OS=='mac'",     {"os_include": "mac"}],
+        ["OS=='solaris'", {"os_include": "solaris"}],
+        ["OS=='win'",     {"os_include": "win32"}],
+        ["OS=='freebsd'", {"os_include": "freebsd"}],
+        ["OS=='openbsd'", {"os_include": "openbsd"}]
+      ]
+    },
+    "target_name": "snappy",
+    "type": "static_library",
+    "standalone_static_library": 1,
+    "include_dirs": [
+      "<(os_include)",
+      "snappy"
+    ],
+    "direct_dependent_settings": {
+      "include_dirs": [
+        "<(os_include)",
+        "snappy"
+      ]
+    },
+    "defines": [
+      "HAVE_CONFIG_H=1"
+    ],
+    "conditions": [
+      ["OS == 'win'", {
+        "defines": [
+          "_HAS_EXCEPTIONS=0"
+        ],
+        "msvs_settings": {
+          "VCCLCompilerTool": {
+            "RuntimeTypeInfo": "false",
+            "EnableFunctionLevelLinking": "true",
+            "ExceptionHandling": "2",
+            "DisableSpecificWarnings": [ "4355", "4530" ,"4267", "4244", "4506", "4018" ]
+          }
+        }
+      }],
+      ["OS == 'linux'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-Wno-unused-function"
+        ],
+        "cflags!": [ "-fno-tree-vrp" ]
+      }],
+      ["OS == 'freebsd'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-Wno-unused-function"
         ]
-    }
-  , 'target_name': 'snappy'
-  , 'type': 'static_library'
-    # Overcomes an issue with the linker and thin .a files on SmartOS
-  , 'standalone_static_library': 1
-  , 'include_dirs': [
-        '<(os_include)'
-      , 'snappy'
-    ]
-  , 'direct_dependent_settings': {
-        'include_dirs': [
-          '<(os_include)'
-          , 'snappy'
+      }],
+      ["OS == 'openbsd'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-Wno-unused-function"
         ]
-    }
-  , 'defines': [
-        'HAVE_CONFIG_H=1'
-    ]
-  , 'conditions': [
-        ['OS == "win"', {
-            'defines': [
-                '_HAS_EXCEPTIONS=0'
-            ]
-          , 'msvs_settings': {
-                'VCCLCompilerTool': {
-                    'RuntimeTypeInfo': 'false'
-                  , 'EnableFunctionLevelLinking': 'true'
-                  , 'ExceptionHandling': '2'
-                  , 'DisableSpecificWarnings': [ '4355', '4530' ,'4267', '4244', '4506', '4018' ]
-                }
-            }
-         }]
-      , ['OS == "linux"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-function'
-            ]
-          , 'cflags!': [ '-fno-tree-vrp' ]
-        }]
-      , ['OS == "freebsd"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-function'
-            ]
-        }]
-      , ['OS == "openbsd"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-function'
-            ]
-        }]
-      , ['OS == "solaris"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-function'
-            ]
-        }]
-      , ['OS == "mac"', {
-            'xcode_settings': {
-                'WARNING_CFLAGS': [
-                    '-Wno-sign-compare'
-                  , '-Wno-unused-function'
-                ]
-            }
-        }]
-      , ['OS == "android"', {
-            'cflags': [
-                '-Wno-sign-compare'
-              , '-fPIC'
-              , '-Wno-unused-function'
-            ]
-          , 'cflags!': [
-                '-fno-tree-vrp'
-              , '-mfloat-abi=hard'
-              , '-fPIE'
-            ]
-        }]
-      , ['target_arch == "arm"', {
-            'cflags': [
-        '-mfloat-abi=hard'
-      ]
-        }]
-    ]
-  , 'sources': [
-        'snappy/snappy-internal.h'
-      , 'snappy/snappy-sinksource.cc'
-      , 'snappy/snappy-sinksource.h'
-      , 'snappy/snappy-stubs-internal.cc'
-      , 'snappy/snappy-stubs-internal.h'
-      , 'snappy/snappy.cc'
-      , 'snappy/snappy.h'
+      }],
+      ["OS == 'solaris'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-Wno-unused-function"
+        ]
+      }],
+      ["OS == 'mac'", {
+        "xcode_settings": {
+          "WARNING_CFLAGS": [
+            "-Wno-sign-compare",
+            "-Wno-unused-function"
+          ]
+        }
+      }],
+      ["OS == 'android'", {
+        "cflags": [
+          "-Wno-sign-compare",
+          "-fPIC",
+          "-Wno-unused-function"
+        ],
+        "cflags!": [
+          "-fno-tree-vrp",
+          "-mfloat-abi=hard",
+          "-fPIE"
+        ]
+      }],
+      ["target_arch == 'arm'", {
+        "cflags": [
+          "-mfloat-abi=hard"
+        ]
+      }]
+    ],
+    "sources": [
+      "snappy/snappy-internal.h",
+      "snappy/snappy-sinksource.cc",
+      "snappy/snappy-sinksource.h",
+      "snappy/snappy-stubs-internal.cc",
+      "snappy/snappy-stubs-internal.h",
+      "snappy/snappy.cc",
+      "snappy/snappy.h"
     ]
-}]}
+  }]
+}
diff --git a/test/port-libuv-fix-test.js b/test/port-libuv-fix-test.js
index 1dd11332..496d76a7 100644
--- a/test/port-libuv-fix-test.js
+++ b/test/port-libuv-fix-test.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 
 test('test port-libuv is being used', function (t) {
   var version = fs.readFileSync(path.join(__dirname, '../deps/leveldb/leveldb.gyp'), 'utf8')
-    .match(/'ldbversion': '([^']+)'/)[1]
+    .match(/"ldbversion": "([^"]+)"/)[1]
   var porth
 
   t.ok(version, 'matched current leveldb version')