Tighten C++ linting rules

Bump benchmark dependencies
Update leak test suppressions
Update future branch details

test/bench/package.json

@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "async": "^1.5.2",
-    "benchmark": "^2.0.0",
+    "benchmark": "^2.1.0",
     "gm": "^1.21.0",
     "imagemagick": "^0.1.3",
-    "imagemagick-native": "elad/node-imagemagick-native",
+    "imagemagick-native": "^1.9.2",
     "jimp": "^0.2.20",
     "lwip": "^0.0.8",
     "semver": "^5.1.0"

test/leak/sharp.supp

@@ -306,26 +306,15 @@
   ...
   fun:vips__magick_read_header
 }
-{
-  cond_magick_is_palette_image_get_bands
-  Memcheck:Cond
-  fun:IsPaletteImage
-  ...
-  fun:get_bands
-}
 {
   value_magick_is_palette_image
   Memcheck:Value8
   fun:IsPaletteImage
-  ...
-  fun:get_bands
 }
 {
-  cond_magick_is_palette_image_parse_header
+  cond_magick_is_palette_image
   Memcheck:Cond
   fun:IsPaletteImage
-  ...
-  fun:parse_header
 }
 
 # glib g_file_read_link

test/unit/cpplint.js

@@ -19,18 +19,15 @@ describe('cpplint', function() {
         // Lint each source file
         cpplint({
           files: [file],
-          linelength: 140,
+          linelength: 120,
           filters: {
             legal: {
               copyright: false
             },
             build: {
-              include: false,
-              include_order: false
+              include: false
             },
             whitespace: {
-              blank_line: false,
-              comments: false,
               parens: false
             }
           }