diff --git a/abiword.rb b/abiword.rb
index 889db94..f77cfa0 100644
--- a/abiword.rb
+++ b/abiword.rb
@@ -1,24 +1,22 @@
-require 'formula'
-
 class Abiword < Formula
-  homepage 'http://www.abisource.com/'
-  url 'http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz'
-  sha1 '998f69d038000b3fc027d4259548f02d67c8d0df'
+  homepage "http://www.abisource.com/"
+  url "http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz"
+  sha256 "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15"
 
   devel do
-    url 'http://www.abisource.com/downloads/abiword/2.9.4/source/abiword-2.9.4.tar.gz'
-    sha1 '67cfbc633129128a1aa48ffba8959229cef2ebdd'
+    url "http://www.abisource.com/downloads/abiword/2.9.4/source/abiword-2.9.4.tar.gz"
+    sha256 "d06b731feb23cbe7b28f5a4afd875e013bfecf8482f7a8bead0afaf74370bbd4"
   end
 
-  depends_on 'libpng'
-  depends_on 'jpeg'
-  depends_on 'fribidi'
-  depends_on 'libgsf'
-  depends_on 'enchant'
-  depends_on 'cairo'
-  depends_on 'pango'
-  depends_on 'wv'
-  depends_on 'imagemagick'
+  depends_on "libpng"
+  depends_on "jpeg"
+  depends_on "fribidi"
+  depends_on "libgsf"
+  depends_on "enchant"
+  depends_on "cairo"
+  depends_on "pango"
+  depends_on "wv"
+  depends_on "imagemagick"
 
   fails_with :clang do
     build 421
@@ -30,14 +28,14 @@ def patches
       # Fixes newer libpng versions; needed for libpng 1.2, too
       :p0 => "https://trac.macports.org/export/102401/trunk/dports/editors/abiword-x11/files/patch-libpng-1.5.diff",
       # Fixes bad glib include
-      :p1 => DATA
+      :p1 => DATA,
     } if build.stable?
   end
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
 
diff --git a/agrep.rb b/agrep.rb
index b52923b..9f60453 100644
--- a/agrep.rb
+++ b/agrep.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Agrep < Formula
-  homepage 'http://en.wikipedia.org/wiki/Agrep'
-  url 'ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z'
-  sha1 '862fa60832b175b9b0c3f43d792f7663a43902b7'
+  homepage "http://en.wikipedia.org/wiki/Agrep"
+  url "ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z"
+  sha256 "31275a2fee28fb8966e1978d26fe8113b61ce49b39e68ddf4cad3964db72d5f8"
 
   def install
     system "make", "CFLAGS=#{ENV.cflags}"
diff --git a/aimage.rb b/aimage.rb
index a1c8a34..18ce007 100644
--- a/aimage.rb
+++ b/aimage.rb
@@ -1,15 +1,13 @@
-require 'formula'
-
 class Aimage < Formula
-  homepage 'http://www.forensicswiki.org/wiki/Aimage'
-  url 'http://pkgs.fedoraproject.org/repo/pkgs/aimage/aimage-3.2.5.tar.gz/07a11d653cdd1d7a5aefe4d99cdbd408/aimage-3.2.5.tar.gz'
-  sha1 '8f3136e9ad3204fb4c91149b3f01a32cc83e0371'
+  homepage "http://www.forensicswiki.org/wiki/Aimage"
+  url "http://pkgs.fedoraproject.org/repo/pkgs/aimage/aimage-3.2.5.tar.gz/07a11d653cdd1d7a5aefe4d99cdbd408/aimage-3.2.5.tar.gz"
+  sha256 "9c362dbb24a064af014677c30d9511ed65b4f2b2c5ea3ba051bc4c5ada635b11"
 
-  depends_on 'afflib'
+  depends_on "afflib"
 
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/aplus.rb b/aplus.rb
index 69e0054..368b92b 100644
--- a/aplus.rb
+++ b/aplus.rb
@@ -1,10 +1,8 @@
-require 'formula'
-
 class Aplus < Formula
-  homepage 'http://www.aplusdev.org/'
-  url 'http://mirrors.kernel.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz'
-  mirror 'http://ftp.us.debian.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz'
-  sha1 'e757cc7654cf35dba15a6a5d6cac5320146558fc'
+  homepage "http://www.aplusdev.org/"
+  url "https://mirrors.kernel.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz"
+  mirror "http://ftp.us.debian.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz"
+  sha256 "74c8bc1ac45941ba2f350d22b5beb1891e6e23996c609114b598ea84c9b2041f"
 
   depends_on :x11
 
diff --git a/attica.rb b/attica.rb
index f90ae46..5eeca50 100644
--- a/attica.rb
+++ b/attica.rb
@@ -1,11 +1,11 @@
-require 'formula'
+require "formula"
 
 class Attica < Formula
-  homepage 'http://www.kde.org/'
-  url 'ftp://ftp.kde.org/pub/kde/stable/attica/attica-0.2.0.tar.bz2'
-  sha1 '724c6e9aab662280ec5b6570b23cf1cfc6c28cc7'
+  homepage "http://www.kde.org/"
+  url "ftp://ftp.kde.org/pub/kde/stable/attica/attica-0.2.0.tar.bz2"
+  sha1 "724c6e9aab662280ec5b6570b23cf1cfc6c28cc7"
 
-  depends_on 'cmake' => :build
+  depends_on "cmake" => :build
 
   def install
     system "cmake #{std_cmake_parameters} ."
diff --git a/authexec.rb b/authexec.rb
index ff2693e..b63703a 100644
--- a/authexec.rb
+++ b/authexec.rb
@@ -1,9 +1,7 @@
-require "formula"
-
 class Authexec < Formula
   homepage "https://github.com/tcurdt/authexec"
   url "https://github.com/tcurdt/authexec/archive/1.0.tar.gz"
-  sha1 "73d8fb4202ae99057691788442bb192972ef304c"
+  sha256 "96e2e3479a22b367a402b38b66f7b67a8ce31dcf2aa2ee869f1d66b978831730"
 
   head "https://github.com/tcurdt/authexec.git"
 
diff --git a/aws-iam-tools.rb b/aws-iam-tools.rb
index 3ffba59..c437e9b 100644
--- a/aws-iam-tools.rb
+++ b/aws-iam-tools.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class AwsIamTools < AmazonWebServicesFormula
-  homepage 'http://aws.amazon.com/developertools/4143'
-  url 'http://awsiammedia.s3.amazonaws.com/public/tools/cli/latest/IAMCli.zip'
-  sha1 'a2bd3048327d1ee34e20abbc8e2cc6c68ebdee5f'
+  homepage "http://aws.amazon.com/developertools/4143"
+  url "http://awsiammedia.s3.amazonaws.com/public/tools/cli/latest/IAMCli.zip"
+  sha256 "eec2795e20c1ec4374ab9c395b63db2b85ba2a74b6468fa3424276152695f68d"
   version "1.5.0"
 
   def install
diff --git a/bcwipe.rb b/bcwipe.rb
index 98be695..403e36c 100644
--- a/bcwipe.rb
+++ b/bcwipe.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Bcwipe < Formula
-  homepage 'http://www.jetico.com/linux/bcwipe-help/'
-  url 'http://www.jetico.com/linux/BCWipe-1.9-9.tar.gz'
-  sha1 'be4d945a5d24076fb6b0356389323a0686e1e4d7'
+  homepage "http://www.jetico.com/linux/bcwipe-help/"
+  url "http://www.jetico.com/linux/BCWipe-1.9-9.tar.gz"
+  sha256 "831f69ae920b27629738ad25228e0c507fa934ce3f75ef10e829b1061299653f"
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/blackbox.rb b/blackbox.rb
index 94073bc..a236eba 100644
--- a/blackbox.rb
+++ b/blackbox.rb
@@ -1,12 +1,10 @@
-require 'formula'
-
 class Blackbox < Formula
-  homepage 'http://www.cs.rochester.edu/u/kautz/satplan/blackbox/'
-  url 'http://www.cs.rochester.edu/u/kautz/satplan/blackbox/Blackbox44.tgz'
-  sha1 '6e61cf9bbb1f28f2dd9f77f9be59fb6fd4fae224'
+  homepage "http://www.cs.rochester.edu/u/kautz/satplan/blackbox/"
+  url "http://www.cs.rochester.edu/u/kautz/satplan/blackbox/Blackbox44.tgz"
+  sha256 "bf63cb7dffa8be6871bc2d059cd636f9ecb40cfacf510ec66880a6af43625ff1"
 
   def install
     system "make"
-    bin.install 'blackbox'
+    bin.install "blackbox"
   end
 end
diff --git a/catdoc.rb b/catdoc.rb
index 38a2e23..a1c22dd 100644
--- a/catdoc.rb
+++ b/catdoc.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Catdoc < Formula
-  homepage 'http://wagner.pp.ru/~vitus/software/catdoc/'
-  url 'http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz'
-  sha1 '50ce9d7cb24ad6b10a856c9c24183e2b0a11ca04'
+  homepage "http://wagner.pp.ru/~vitus/software/catdoc/"
+  url "http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz"
+  sha256 "03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362"
 
   fails_with :clang do
     cause "The source uses undocumented behavior (decrementing null)."
@@ -11,7 +9,7 @@ class Catdoc < Formula
 
   def install
     # catdoc configure says it respects --mandir=, but does not.
-    ENV['man1dir'] = man1
+    ENV["man1dir"] = man1
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     # The INSTALL file confuses make on case insensitive filesystems.
@@ -19,6 +17,6 @@ def install
     system "make"
     # There is a race condition in the charsets/Makefile install target. The following line solves it.
     system "make -C charsets install-dirs"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/cdf.rb b/cdf.rb
index 29ecfae..52f453e 100644
--- a/cdf.rb
+++ b/cdf.rb
@@ -1,9 +1,9 @@
-require 'formula'
+require "formula"
 
 class Cdf < Formula
-  homepage 'http://bmp-plugins.berlios.de/misc/cdf/cdf.html'
-  url 'http://download.berlios.de/bmp-plugins/cdf-0.2.tar.gz'
-  sha1 '5f5d0c1f1003d9ad3c3cbbda1d8159e9fe10768a'
+  homepage "http://bmp-plugins.berlios.de/misc/cdf/cdf.html"
+  url "http://download.berlios.de/bmp-plugins/cdf-0.2.tar.gz"
+  sha1 "5f5d0c1f1003d9ad3c3cbbda1d8159e9fe10768a"
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/celt.rb b/celt.rb
index d4be023..101cf89 100644
--- a/celt.rb
+++ b/celt.rb
@@ -16,7 +16,7 @@ def install
     ENV.universal_binary if build.universal?
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make check"
-    system "make install"
+    system "make", "check"
+    system "make", "install"
   end
 end
diff --git a/clam.rb b/clam.rb
index fc5a53c..31c74e3 100644
--- a/clam.rb
+++ b/clam.rb
@@ -1,19 +1,17 @@
-require 'formula'
-
 class Clam < Formula
-  homepage 'http://clam-project.org'
-  url 'http://clam-project.org/download/src/CLAM-1.4.0.tar.gz'
-  sha1 '32acbdc64e641b4a666e8e58e008430a6a906cd0'
+  homepage "http://clam-project.org"
+  url "http://clam-project.org/download/src/CLAM-1.4.0.tar.gz"
+  sha256 "36fb156b01bb88276962763fef18cd1533cc10d64f8d7824b4623bf5d761bd4d"
 
-  depends_on 'scons' => :build
-  depends_on 'xerces-c'
-  depends_on 'fftw'
-  depends_on 'libsndfile'
-  depends_on 'libvorbis'
-  depends_on 'mad'
-  depends_on 'jack'
-  depends_on 'portaudio'
-  depends_on 'id3lib'
+  depends_on "scons" => :build
+  depends_on "xerces-c"
+  depends_on "fftw"
+  depends_on "libsndfile"
+  depends_on "libvorbis"
+  depends_on "mad"
+  depends_on "jack"
+  depends_on "portaudio"
+  depends_on "id3lib"
 
   def install
     scons "configure", "prefix=#{prefix}", "with_ladspa=no", "xmlbackend=none"
diff --git a/comparepdf.rb b/comparepdf.rb
index 4029e87..f9f09b0 100644
--- a/comparepdf.rb
+++ b/comparepdf.rb
@@ -1,24 +1,22 @@
-require 'formula'
-
 class Comparepdf < Formula
-  homepage 'http://www.qtrac.eu/comparepdf.html'
-  url 'http://www.qtrac.eu/comparepdf-1.0.1.tar.gz'
-  sha1 '01774dac78dca9b712d55bfdbaf58c4b0bd31295'
+  homepage "http://www.qtrac.eu/comparepdf.html"
+  url "http://www.qtrac.eu/comparepdf-1.0.1.tar.gz"
+  sha256 "cfb092fc40a8ed1317af36a574a470280eaeffcb9056095a65c974abd060c82c"
 
-  depends_on 'qt'
-  depends_on 'poppler' => 'with-qt4'
+  depends_on "qt"
+  depends_on "poppler" => "with-qt4"
 
   def install
     # Generate makefile and disable .app creation
     if MacOS.version >= :mavericks && ENV.compiler == :clang
-      spec = 'unsupported/macx-clang-libc++'
+      spec = "unsupported/macx-clang-libc++"
     else
-      spec = 'macx-g++'
+      spec = "macx-g++"
     end
-    system 'qmake', '-spec', spec, 'CONFIG-=app_bundle'
-    system 'make'
+    system "qmake", "-spec", spec, "CONFIG-=app_bundle"
+    system "make"
 
-    bin.install 'comparepdf'
-    man1.install 'comparepdf.1'
+    bin.install "comparepdf"
+    man1.install "comparepdf.1"
   end
 end
diff --git a/connect.rb b/connect.rb
index 7b892b0..10de24c 100644
--- a/connect.rb
+++ b/connect.rb
@@ -1,10 +1,10 @@
-require 'formula'
+require "formula"
 
 class Connect < Formula
-  homepage 'http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html'
-  url 'http://www.meadowy.org/~gotoh/ssh/connect.c'
-  version '1.100'
-  sha1 '39614dfa842514f46bdb6ff66a10d2f5b084234f'
+  homepage "http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html"
+  url "http://www.meadowy.org/~gotoh/ssh/connect.c"
+  version "1.100"
+  sha1 "39614dfa842514f46bdb6ff66a10d2f5b084234f"
 
   def install
     system ENV.cc, "connect.c", "-o", "connect", "-lresolv"
diff --git a/dbslayer.rb b/dbslayer.rb
index bab9625..9a49265 100644
--- a/dbslayer.rb
+++ b/dbslayer.rb
@@ -1,10 +1,10 @@
-require 'formula'
+require "formula"
 
 class Dbslayer < Formula
-  homepage 'http://code.nytimes.com/projects/dbslayer/wiki'
-  url 'http://code.nytimes.com/downloads/dbslayer-beta-12.tgz'
-  version '0.12.b'
-  sha1 'fbf1c5563a6ee45783e31f6b49612e64fc141186'
+  homepage "http://code.nytimes.com/projects/dbslayer/wiki"
+  url "http://code.nytimes.com/downloads/dbslayer-beta-12.tgz"
+  version "0.12.b"
+  sha1 "fbf1c5563a6ee45783e31f6b49612e64fc141186"
 
   depends_on :mysql
 
diff --git a/denyhosts.rb b/denyhosts.rb
index 9919cd5..853f5ac 100644
--- a/denyhosts.rb
+++ b/denyhosts.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Denyhosts < Formula
-  homepage 'http://denyhosts.sourceforge.net/'
-  url 'https://downloads.sourceforge.net/project/denyhosts/denyhosts/2.6/DenyHosts-2.6.tar.gz'
-  sha1 '02143843cb7c37c986c222b7acc11f7b75eb7373'
+  homepage "http://denyhosts.sourceforge.net/"
+  url "https://downloads.sourceforge.net/project/denyhosts/denyhosts/2.6/DenyHosts-2.6.tar.gz"
+  sha256 "5190ead13a7238e3ccf328cb3b71b16716e1c73939909a4f3fa6904ba58ddf7d"
 
   depends_on :python
 
@@ -13,21 +11,21 @@ class Denyhosts < Formula
   def install
     # If the `libpath` is relative, instead of absolute, we can influence the
     # 'data path' via command line arguments to `setup.py`.
-    inreplace 'setup.py' do |s|
-      s.change_make_var! 'libpath', "''"
-      s.change_make_var! 'scriptspath', "''"
-      s.change_make_var! 'pluginspath', "''"
+    inreplace "setup.py" do |s|
+      s.change_make_var! "libpath", "''"
+      s.change_make_var! "scriptspath", "''"
+      s.change_make_var! "pluginspath", "''"
     end
 
     # Make it so that all DenyHosts tools have a default path that points at
     # our config file.
-    inreplace 'DenyHosts/constants.py' do |s|
-      s.change_make_var! 'CONFIG_FILE', "'#{etc}/denyhosts.cfg'"
+    inreplace "DenyHosts/constants.py" do |s|
+      s.change_make_var! "CONFIG_FILE", "'#{etc}/denyhosts.cfg'"
     end
 
     unless MacOS.mountain_lion_or_newer?
-      inreplace 'denyhosts.cfg' do |s|
-        s.gsub! %r{^SECURE_LOG\s*=\s*/private/var/log/system\.log}, 'SECURE_LOG = /private/var/log/secure.log'
+      inreplace "denyhosts.cfg" do |s|
+        s.gsub! %r{^SECURE_LOG\s*=\s*/private/var/log/system\.log}, "SECURE_LOG = /private/var/log/secure.log"
       end
     end
 
@@ -38,14 +36,14 @@ def install
                                  "--install-scripts=#{bin}",
                                  "--install-data=#{libexec}"
     end
-    libexec.install 'daemon-control'
-    (libexec+'daemon-control').chmod 0755
+    libexec.install "daemon-control"
+    (libexec+"daemon-control").chmod 0755
 
     # Don't overwrite the config file; the user may have tweaked it.
-    etc.install 'denyhosts.cfg'
+    etc.install "denyhosts.cfg"
 
-    sbin.install_symlink libexec+'daemon-control'
-    sbin.install_symlink libexec+'denyhosts.py' => 'denyhosts'
+    sbin.install_symlink libexec+"daemon-control"
+    sbin.install_symlink libexec+"denyhosts.py" => "denyhosts"
   end
 
   plist_options :startup => true
diff --git a/drizzle.rb b/drizzle.rb
index d951356..632c926 100644
--- a/drizzle.rb
+++ b/drizzle.rb
@@ -1,24 +1,22 @@
-require 'formula'
-
 class Drizzle < Formula
-  homepage 'http://www.drizzle.org'
-  url 'https://launchpad.net/drizzle/7.1/7.1.36/+download/drizzle-7.1.36-stable.tar.gz'
-  sha1 '6ce317d6a6b0560e75d5bcf44af2e278443cfbfe'
+  homepage "http://www.drizzle.org"
+  url "https://launchpad.net/drizzle/7.1/7.1.36/+download/drizzle-7.1.36-stable.tar.gz"
+  sha256 "ee7fb86a58c6c017e451d68ca1b7b9247183e6f9f188035b01b04818f1d9269c"
 
   depends_on :macos => :lion
-  depends_on 'intltool' => :build
+  depends_on "intltool" => :build
 
   # https://github.com/mxcl/homebrew/issues/14289
-  depends_on 'boost149'
-  depends_on 'protobuf'
-  depends_on 'libevent'
-  depends_on 'pcre'
-  depends_on 'libgcrypt'
-  depends_on 'readline'
+  depends_on "boost149"
+  depends_on "protobuf"
+  depends_on "libevent"
+  depends_on "pcre"
+  depends_on "libgcrypt"
+  depends_on "readline"
 
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/dsniff.rb b/dsniff.rb
index 791b9de..36c4509 100644
--- a/dsniff.rb
+++ b/dsniff.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
 class NoBdb5 < Requirement
   satisfy(:build_env => false) { !Formula["berkeley-db"].installed? }
 
@@ -14,45 +12,45 @@ def message; <<-EOS.undent
 end
 
 class Dsniff < Formula
-  homepage 'http://monkey.org/~dugsong/dsniff/'
-  url 'http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz'
-  sha1 '25cfea26e9bbe016451180758a49d4d5bc9317d3'
+  homepage "http://monkey.org/~dugsong/dsniff/"
+  url "http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz"
+  sha256 "a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a"
 
   depends_on NoBdb5
-  depends_on 'libnet'
-  depends_on 'libnids'
+  depends_on "libnet"
+  depends_on "libnids"
 
   def patches
-  {:p0 => [
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-arpspoof.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-dnsspoof.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-filesnarf.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-macof.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-pcaputil.c",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-record.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshcrypto.c",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshmitm.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshow.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcp_raw.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcp_raw.h.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcpkill.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcpnice.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-trigger.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-trigger.h.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-urlsnarf.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-webmitm.c.diff",
-    "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-webspy.c.diff"
-  ]}
+    { :p0 => [
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-arpspoof.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-dnsspoof.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-filesnarf.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-macof.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-pcaputil.c",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-record.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshcrypto.c",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshmitm.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-sshow.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcp_raw.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcp_raw.h.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcpkill.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-tcpnice.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-trigger.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-trigger.h.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-urlsnarf.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-webmitm.c.diff",
+      "https://trac.macports.org/export/90933/trunk/dports/net/dsniff-devel/files/patch-webspy.c.diff",
+    ] }
   end
 
   def install
-    ENV.append 'CFLAGS', "-DBIND_8_COMPAT"
+    ENV.append "CFLAGS", "-DBIND_8_COMPAT"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
                           "--with-libnet=#{HOMEBREW_PREFIX}",
                           "--with-libnids=#{HOMEBREW_PREFIX}"
     system "make"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/dupx.rb b/dupx.rb
index 12f24fb..6094ecc 100644
--- a/dupx.rb
+++ b/dupx.rb
@@ -1,12 +1,10 @@
-require 'formula'
-
 class Dupx < Formula
-  homepage 'http://www.isi.edu/~yuri/dupx/'
-  url 'http://www.isi.edu/~yuri/dupx/dupx-0.1.tar.gz'
-  sha1 '69cac2bacc9aefff59e84d5bfd053f01c1bc7551'
+  homepage "http://www.isi.edu/~yuri/dupx/"
+  url "http://www.isi.edu/~yuri/dupx/dupx-0.1.tar.gz"
+  sha256 "7837501162a6387320d1327ec61abc260c3b8c06c9985d41e1f0c3b52f9f9f41"
 
   def install
     system "./configure", "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/electric-fence.rb b/electric-fence.rb
index 53a4979..2cbe3a5 100644
--- a/electric-fence.rb
+++ b/electric-fence.rb
@@ -1,10 +1,10 @@
-require 'formula'
+require "formula"
 
 class ElectricFence < Formula
-  homepage 'http://perens.com/FreeSoftware/ElectricFence/'
-  url 'http://perens.com/FreeSoftware/ElectricFence/electric-fence_2.1.13-0.1.tar.gz'
-  version '2.1.13-0.1'
-  sha1 'e6765bcb1543272040b806eea706fc7ae9b60524'
+  homepage "http://perens.com/FreeSoftware/ElectricFence/"
+  url "http://perens.com/FreeSoftware/ElectricFence/electric-fence_2.1.13-0.1.tar.gz"
+  version "2.1.13-0.1"
+  sha1 "e6765bcb1543272040b806eea706fc7ae9b60524"
 
   # Patch based on this MacPorts port: https://trac.macports.org/ticket/23836
   # Discussion on how to port it to OS X: http://lists.apple.com/archives/xcode-users/2005/Oct/msg00791.html
@@ -17,7 +17,7 @@ def install
   end
 
   test do
-    (testpath/'test1.c').write <<-EOS.undent
+    (testpath/"test1.c").write <<-EOS.undent
        #include <stdlib.h>
        int main() {
           int *arr = (int*)malloc(sizeof(int) * 10);
@@ -25,7 +25,7 @@ def install
           return 0;
        }
     EOS
-    #{ENV.cc}, (testpath/'test1.c'), '-lefence'
+    # {ENV.cc}, (testpath/'test1.c'), '-lefence'
   end
 end
 
diff --git a/flusspferd.rb b/flusspferd.rb
index 904e7eb..b91c8f1 100644
--- a/flusspferd.rb
+++ b/flusspferd.rb
@@ -1,20 +1,18 @@
-require 'formula'
-
 class Flusspferd < Formula
-  homepage 'http://flusspferd.github.io/'
-  url 'https://github.com/Flusspferd/flusspferd/archive/v0.9.tar.gz'
-  sha1 '4d32bbd4e398ef12bd14f9347130a44733e7bb7d'
+  homepage "https://flusspferd.github.io/"
+  url "https://github.com/Flusspferd/flusspferd/archive/v0.9.tar.gz"
+  sha256 "43f2b74bdde832ca0f85c6ff764956d5bde8945a61e625758a7b0801103317de"
 
-  depends_on 'cmake' => :build
-  depends_on 'arabica'
-  depends_on 'gmp'
-  depends_on 'boost'
-  depends_on 'spidermonkey'
+  depends_on "cmake" => :build
+  depends_on "arabica"
+  depends_on "gmp"
+  depends_on "boost"
+  depends_on "spidermonkey"
 
   fails_with_llvm
 
   def install
     system "cmake -H. -Bbuild #{std_cmake_parameters}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/fsv.rb b/fsv.rb
index e5ab38d..4f2f117 100644
--- a/fsv.rb
+++ b/fsv.rb
@@ -1,5 +1,3 @@
-require "formula"
-
 class Fsv < Formula
   homepage "http://fsv.sourceforge.net/"
   url "https://github.com/mcuelenaere/fsv.git", :tag => "fsv-0.9-1"
diff --git a/git-flow-clone.rb b/git-flow-clone.rb
index 4ab12d3..5d9e37c 100644
--- a/git-flow-clone.rb
+++ b/git-flow-clone.rb
@@ -1,7 +1,7 @@
 class GitFlowClone < Formula
   homepage "https://github.com/ashirazi/git-flow-clone"
   url "https://github.com/ashirazi/git-flow-clone/archive/0.1.2.tar.gz"
-  sha1 "d4d5c106ebd7de8abbee69f0b277ecdfe85e5b6d"
+  sha256 "e741d7add3c69ab4da0eddb40edc3f173f1a0cf349bc92131380c64c35eac9f7"
 
   def install
     system "make", "prefix=#{prefix}", "install"
diff --git a/gkrellm.rb b/gkrellm.rb
index 67388a2..3b11a3f 100644
--- a/gkrellm.rb
+++ b/gkrellm.rb
@@ -1,39 +1,37 @@
-require 'formula'
-
 class Gkrellm < Formula
-  homepage 'http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html'
-  url 'http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2'
-  sha1 'bcfc2efb5fd3f27e9bb703bda73f6a1d96b080df'
+  homepage "http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
+  url "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2"
+  sha256 "702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b"
 
   depends_on :x11
-  depends_on 'pkg-config' => :build
-  depends_on 'atk'
-  depends_on 'cairo'
-  depends_on 'fontconfig'
-  depends_on 'freetype'
-  depends_on 'gdk-pixbuf'
-  depends_on 'gettext'
-  depends_on 'glib'
-  depends_on 'gtk+'
-  depends_on 'pango'
+  depends_on "pkg-config" => :build
+  depends_on "atk"
+  depends_on "cairo"
+  depends_on "fontconfig"
+  depends_on "freetype"
+  depends_on "gdk-pixbuf"
+  depends_on "gettext"
+  depends_on "glib"
+  depends_on "gtk+"
+  depends_on "pango"
 
   patch :p0 do
     url "https://trac.macports.org/export/115088/trunk/dports/sysutils/gkrellm/files/207a0519ac73290ba65b6e5f7446549a2a66f5d2.patch"
-    sha1 "db6342bdecc9ff0470dccbc4b3d10b1c0d078c67"
+    sha256 "d005e7ad9b4c46d4930ccb4391481716b72c9a68454b8d8f4dfd2b597bfd77cc"
   end
 
   patch :p0 do
     url "https://trac.macports.org/export/115088/trunk/dports/sysutils/gkrellm/files/patch-src-Makefile.diff"
-    sha1 "419adbc2d41b36a435fa1ba76106b63bf8879df9"
+    sha256 "0c24c66ea0163bc7d3fcbe87f742a2fe66afdc76d6af19fcd5137a4749518d90"
   end
 
   def install
-    inreplace 'Makefile', '$(PREFIX)', prefix
-    inreplace 'src/gkrellm.h' do |s|
-      s.gsub! '/usr/local/share/gkrellm2/themes', "#{share}/gkrellm2/themes"
-      s.gsub! 'src/gkrellm.h', '/usr/share/gkrellm2/themes', "#{share}/gkrellm2/themes"
-      s.gsub! 'src/gkrellm.h', '/usr/local/lib/gkrellm2/plugins', "#{libexec}/gkrellm2/plugins"
-      s.gsub! 'src/gkrellm.h', '/usr/lib/gkrellm2/plugins', "#{libexec}/gkrellm2/plugins"
+    inreplace "Makefile", "$(PREFIX)", prefix
+    inreplace "src/gkrellm.h" do |s|
+      s.gsub! "/usr/local/share/gkrellm2/themes", "#{share}/gkrellm2/themes"
+      s.gsub! "src/gkrellm.h", "/usr/share/gkrellm2/themes", "#{share}/gkrellm2/themes"
+      s.gsub! "src/gkrellm.h", "/usr/local/lib/gkrellm2/plugins", "#{libexec}/gkrellm2/plugins"
+      s.gsub! "src/gkrellm.h", "/usr/lib/gkrellm2/plugins", "#{libexec}/gkrellm2/plugins"
     end
 
     system "make", "darwin9"
diff --git a/gnunet.rb b/gnunet.rb
index a21f7e1..508316d 100644
--- a/gnunet.rb
+++ b/gnunet.rb
@@ -1,22 +1,20 @@
-require 'formula'
-
 class Gnunet < Formula
-  homepage 'https://gnunet.org/'
-  url 'http://ftpmirror.gnu.org/gnunet/gnunet-0.9.5a.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/gnunet/gnunet-0.9.5a.tar.gz'
-  sha256 '1d600717eee1f952e23d192288850a67948e92e0b1dee5d950d111b2670cbed7'
+  homepage "https://gnunet.org/"
+  url "http://ftpmirror.gnu.org/gnunet/gnunet-0.9.5a.tar.gz"
+  mirror "https://ftp.gnu.org/gnu/gnunet/gnunet-0.9.5a.tar.gz"
+  sha256 "1d600717eee1f952e23d192288850a67948e92e0b1dee5d950d111b2670cbed7"
 
-  depends_on 'libidn'
-  depends_on 'libgcrypt'
-  depends_on 'libextractor'
-  depends_on 'libunistring'
-  depends_on 'curl' if MacOS.version < :lion # needs >= v7.20.1
+  depends_on "libidn"
+  depends_on "libgcrypt"
+  depends_on "libextractor"
+  depends_on "libunistring"
+  depends_on "curl" if MacOS.version < :lion # needs >= v7.20.1
 
   def install
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 
   test do
diff --git a/googlecl.rb b/googlecl.rb
index d1511fc..d6bdc1f 100644
--- a/googlecl.rb
+++ b/googlecl.rb
@@ -2,7 +2,7 @@ class Googlecl < Formula
   desc "Manage Google services from the command-line"
   homepage "https://code.google.com/p/googlecl/"
   url "https://googlecl.googlecode.com/files/googlecl-0.9.14.tar.gz"
-  sha1 "810b2426e2c5e5292e507837ea425e66f4949a1d"
+  sha256 "0a4640b1240104b8020f9af526e24afe53a8327390d95ef28e1ca093673fce5a"
 
   depends_on :python if MacOS.version <= :snow_leopard
 
@@ -10,7 +10,7 @@ class Googlecl < Formula
 
   resource "gdata" do
     url "https://pypi.python.org/packages/source/g/gdata/gdata-2.0.18.tar.gz"
-    sha1 "4cd6804f2af81697219307421996c6055c7c16e4"
+    sha256 "56e7d22de819c22b13ceb0fe1869729b4287f89ebbd4bb55380d7bcf61a1fdb6"
   end
 
   def install
diff --git a/gpredict.rb b/gpredict.rb
index fb7018e..14fc476 100644
--- a/gpredict.rb
+++ b/gpredict.rb
@@ -1,22 +1,20 @@
-require 'formula'
-
 class Gpredict < Formula
-  homepage 'http://gpredict.oz9aec.net/'
-  url 'https://downloads.sourceforge.net/project/gpredict/Gpredict/1.3/gpredict-1.3.tar.gz'
-  sha1 'a02a979fb68f9be8b9294a7c4ca248aaecd73b34'
+  homepage "http://gpredict.oz9aec.net/"
+  url "https://downloads.sourceforge.net/project/gpredict/Gpredict/1.3/gpredict-1.3.tar.gz"
+  sha256 "b0f6beed8da1b2c513ba1f22593195c6097fc7ccfc66cba4bdbc16277238d5a3"
 
   depends_on :x11
-  depends_on 'pkg-config' => :build
-  depends_on 'intltool' => :build
-  depends_on 'curl'
-  depends_on 'gettext'
-  depends_on 'glib'
-  depends_on 'goocanvas'
-  depends_on 'gtk+'
-  depends_on 'hamlib'
+  depends_on "pkg-config" => :build
+  depends_on "intltool" => :build
+  depends_on "curl"
+  depends_on "gettext"
+  depends_on "glib"
+  depends_on "goocanvas"
+  depends_on "gtk+"
+  depends_on "hamlib"
 
   def install
-    gettext = Formula['gettext']
+    gettext = Formula["gettext"]
     ENV.append "CFLAGS", "-I#{gettext.include}"
     ENV.append "LDFLAGS", "-L#{gettext.lib}"
 
diff --git a/graylog2-server.rb b/graylog2-server.rb
index e0833c5..fd73a95 100644
--- a/graylog2-server.rb
+++ b/graylog2-server.rb
@@ -1,12 +1,12 @@
-require 'formula'
+require "formula"
 
 class Graylog2Server < Formula
-  homepage 'http://www.graylog2.org/'
-  url 'http://download.graylog2.org/graylog2-server/graylog2-server-0.11.0.tar.gz'
-  sha1 '03c94ce8f255a486d13b38c9ebad159588b30bef'
+  homepage "http://www.graylog2.org/"
+  url "http://download.graylog2.org/graylog2-server/graylog2-server-0.11.0.tar.gz"
+  sha1 "03c94ce8f255a486d13b38c9ebad159588b30bef"
 
-  depends_on 'elasticsearch'
-  depends_on 'mongodb'
+  depends_on "elasticsearch"
+  depends_on "mongodb"
 
   def install
     mv "graylog2.conf.example", "graylog2.conf"
@@ -25,7 +25,7 @@ def install
     end
 
     etc.install "graylog2.conf"
-    prefix.install Dir['*']
+    prefix.install Dir["*"]
   end
 
   def caveats; <<-EOS.undent
diff --git a/gtkglarea.rb b/gtkglarea.rb
index 58f23ef..2c93cef 100644
--- a/gtkglarea.rb
+++ b/gtkglarea.rb
@@ -1,17 +1,15 @@
-require 'formula'
-
 class Gtkglarea < Formula
   desc "OpenGL context provider for GTK+"
-  homepage 'https://github.com/GNOME/gtkglarea'
-  url 'http://ftp.gnome.org/pub/GNOME/sources/gtkglarea/2.0/gtkglarea-2.0.1.tar.gz'
-  sha1 'db12f2bb9a3d28d69834832e2e04a255acfd8a6d'
+  homepage "https://github.com/GNOME/gtkglarea"
+  url "http://ftp.gnome.org/pub/GNOME/sources/gtkglarea/2.0/gtkglarea-2.0.1.tar.gz"
+  sha256 "dffe1cc0512d20d3840d0a1f3eff727bf2207c5c6714125155ca0cee0b177179"
 
   depends_on :x11
-  depends_on 'gtk+'
-  depends_on 'pkg-config' => :build
+  depends_on "gtk+"
+  depends_on "pkg-config" => :build
 
   def install
-    ENV.append 'LDFLAGS', '-lX11'
+    ENV.append "LDFLAGS", "-lX11"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make", "install"
diff --git a/gtkglextmm.rb b/gtkglextmm.rb
index 06d9012..d947ec5 100644
--- a/gtkglextmm.rb
+++ b/gtkglextmm.rb
@@ -1,13 +1,11 @@
-require 'formula'
-
 class Gtkglextmm < Formula
-  homepage 'http://projects.gnome.org/gtkglext'
-  url 'https://downloads.sourceforge.net/gtkglext/gtkglextmm-1.2.0.tar.gz'
-  sha1 '5cd489e07517a88262cd6050f723227664e82996'
+  homepage "http://projects.gnome.org/gtkglext"
+  url "https://downloads.sourceforge.net/gtkglext/gtkglextmm-1.2.0.tar.gz"
+  sha256 "8f499c1f95678c56cce908c10bf2c1d0f2267b87e0c480385fa4b128c75bdf7b"
 
-  depends_on 'pkg-config' => :build
-  depends_on 'gtkglext'
-  depends_on 'gtkmm'
+  depends_on "pkg-config" => :build
+  depends_on "gtkglext"
+  depends_on "gtkmm"
   depends_on :x11
 
   # Fixes header include order, using patch from macports: https://trac.macports.org/ticket/27059
@@ -20,6 +18,6 @@ def install
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/guilt.rb b/guilt.rb
index 3d691df..5f77011 100644
--- a/guilt.rb
+++ b/guilt.rb
@@ -1,5 +1,5 @@
 class Guilt < Formula
-  homepage "http://packages.debian.org/wheezy/guilt"
+  homepage "https://packages.debian.org/wheezy/guilt"
   url "http://ftp.de.debian.org/debian/pool/main/g/guilt/guilt_0.35.orig.tar.gz"
   sha256 "82df72571b8f50b5428ad75ccc7388ceb7f8e3b57e2c03b16e5b6cfe930f6381"
 
diff --git a/hllib.rb b/hllib.rb
index 3ce6d0c..2246863 100644
--- a/hllib.rb
+++ b/hllib.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Hllib < Formula
   homepage 'http://nemesis.thewavelength.net/index.php?p=35'
   url 'http://nemesis.thewavelength.net/files/files/hllib242.zip'
-  sha1 '2b2b9900e7cc412c6d36224d469c9a6b0477011f'
+  sha256 "17cf3fee282c97ac8ea4ac0f3541850f30a4ca0188f154c5e5cda033a454cf02"
   version '2.4.2'
 
   def install
@@ -17,14 +15,14 @@ def install
         # Remove -soname directive
         s.gsub! '-shared -Wl,-soname,libhl.so.2', '-shared -Wl'
         # Ownership isn't needed here
-        s.gsub! %r{ -[og] root}, ''
+        s.gsub! / -[og] root/, ''
         # .dylib is the OS X equivalent of .so
         s.gsub! 'libhl.so.$(HLLIB_VERS)', 'libhl.$(HLLIB_VERS).dylib'
         s.gsub! '$(PREFIX)/lib/libhl.so.2', '$(PREFIX)/lib/libhl.2.dylib'
         s.gsub! '$(PREFIX)/lib/libhl.so', '$(PREFIX)/lib/libhl.dylib'
       end
       # Install
-      system "make install"
+      system "make", "install"
     end
     # Extract tool
     cd 'HLExtract' do
diff --git a/hugs98.rb b/hugs98.rb
index 6c4f9ac..b220c8c 100644
--- a/hugs98.rb
+++ b/hugs98.rb
@@ -1,15 +1,15 @@
-require 'formula'
+require "formula"
 
 class Hugs98 < Formula
-  homepage 'http://www.haskell.org/hugs/'
-  url 'http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-plus-Sep2006.tar.gz'
-  version 'plus-Sep2006'
-  sha1 '1464a80c715bc5f786ea5a4e4257b2ff0dc7e1e9'
+  homepage "http://www.haskell.org/hugs/"
+  url "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-plus-Sep2006.tar.gz"
+  version "plus-Sep2006"
+  sha1 "1464a80c715bc5f786ea5a4e4257b2ff0dc7e1e9"
 
-  depends_on 'readline'
+  depends_on "readline"
 
   fails_with :clang do
-    cause %[ERROR "../libraries/bootlib/Data/Dynamic.hs" - Module "Main" already loaded]
+    cause %(ERROR "../libraries/bootlib/Data/Dynamic.hs" - Module "Main" already loaded)
   end
 
   patch :p0 do
diff --git a/iulib.rb b/iulib.rb
index 04d51ca..91e0753 100644
--- a/iulib.rb
+++ b/iulib.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Iulib < Formula
-  homepage 'http://code.google.com/p/iulib/'
-  url 'https://iulib.googlecode.com/files/iulib-0.4.tgz'
-  sha1 '96a006f806a650886fdd59b1239f6e56d1a864c1'
+  homepage "https://code.google.com/p/iulib/"
+  url "https://iulib.googlecode.com/files/iulib-0.4.tgz"
+  sha256 "c70dab420f5ce0ff0185c922881576f4a82eacec3feb0befa66bd7468151d99b"
 
   depends_on "autoconf" => :build
   depends_on "automake" => :build
@@ -18,7 +16,7 @@ def install
     system "aclocal"
     system "./build", "--prefix=#{prefix}"
     system "make"
-    system "make install"
+    system "make", "install"
   end
 end
 
diff --git a/jscoverage.rb b/jscoverage.rb
index 49973b2..9583612 100644
--- a/jscoverage.rb
+++ b/jscoverage.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Jscoverage < Formula
-  homepage 'http://siliconforks.com/jscoverage/'
-  url 'http://siliconforks.com/jscoverage/download/jscoverage-0.5.1.tar.bz2'
-  sha1 '0d655296b593beb15c2261d97df314572ebd7319'
+  homepage "http://siliconforks.com/jscoverage/"
+  url "http://siliconforks.com/jscoverage/download/jscoverage-0.5.1.tar.bz2"
+  sha256 "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"
 
   # Fixes compile errors with clang, int main should return a value
   # Reported upstream: http://siliconforks.com/jscoverage/bugs/42
@@ -12,18 +10,18 @@ class Jscoverage < Formula
   def install
     # Fix a hardcoded gcc and g++ configure error when clang.
     # Reported upstream: http://siliconforks.com/jscoverage/bugs/42
-    inreplace 'js/configure.gnu' do |f|
-      f.gsub! 'export CC=gcc', "export CC=#{ENV.cc}"
-      f.gsub! 'export CXX=g++', "export CXX=#{ENV.cxx}"
-      f.gsub! 'gcc -E', "#{ENV.cc} -E"
-      f.gsub! 'g++ -E', "#{ENV.cxx} -E"
+    inreplace "js/configure.gnu" do |f|
+      f.gsub! "export CC=gcc", "export CC=#{ENV.cc}"
+      f.gsub! "export CXX=g++", "export CXX=#{ENV.cxx}"
+      f.gsub! "gcc -E", "#{ENV.cc} -E"
+      f.gsub! "g++ -E", "#{ENV.cxx} -E"
     end
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make"
-    bin.install('jscoverage');
-    bin.install('jscoverage-server');
+    bin.install("jscoverage")
+    bin.install("jscoverage-server")
   end
 end
 
diff --git a/jstalk.rb b/jstalk.rb
index 2455453..d77620c 100644
--- a/jstalk.rb
+++ b/jstalk.rb
@@ -1,11 +1,9 @@
-require 'formula'
-
 class Jstalk < Formula
-  homepage 'http://jstalk.org/'
-  url 'https://github.com/ccgus/jstalk/archive/v1.0.1.tar.gz'
-  sha1 '9257333ca347bc29cfc5e97cc199b61cfefa2168'
+  homepage "http://jstalk.org/"
+  url "https://github.com/ccgus/jstalk/archive/v1.0.1.tar.gz"
+  sha256 "7e84581efd67fe3c0a144bda40755db9718369e57e88860e7ce52a2a9194d036"
 
-  head 'https://github.com/ccgus/jstalk.git'
+  head "https://github.com/ccgus/jstalk.git"
 
   depends_on :macos => :snow_leopard
   depends_on :xcode => :build
@@ -15,10 +13,10 @@ def install
       xcodebuild "-target", t, "-configuration", "Release", "ONLY_ACTIVE_ARCH=YES", "SYMROOT=build"
     end
 
-    cd 'build/Release' do
-      bin.install 'jstalk'
+    cd "build/Release" do
+      bin.install "jstalk"
       prefix.install "JSTalk Editor.app"
-      frameworks.install 'JSTalk.framework'
+      frameworks.install "JSTalk.framework"
     end
   end
 end
diff --git a/justniffer.rb b/justniffer.rb
index 811e86f..5b2e28e 100644
--- a/justniffer.rb
+++ b/justniffer.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Justniffer < Formula
-  homepage 'http://justniffer.sourceforge.net/'
-  url 'https://downloads.sourceforge.net/project/justniffer/justniffer/justniffer%200.5.11/justniffer_0.5.11.tar.gz'
-  sha1 '3f3222361794a6f79f47567753550995c318a037'
+  homepage "http://justniffer.sourceforge.net/"
+  url "https://downloads.sourceforge.net/project/justniffer/justniffer/justniffer%200.5.11/justniffer_0.5.11.tar.gz"
+  sha256 "2c0d954bd02cb0590c7f37e768931f97753220e908d974e7e9399481c8f6a923"
 
   depends_on "boost"
 
@@ -31,11 +29,11 @@ class Justniffer < Formula
 
   def install
     system "./configure", "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 
   test do
-    require 'open3'
+    require "open3"
     Open3.popen3("#{bin}/justniffer", "--version") do |_, stdout, _|
       assert_match /justniffer #{Regexp.escape(version)}/, stdout.read
     end
diff --git a/jwhois.rb b/jwhois.rb
index 31f6646..ff2c442 100644
--- a/jwhois.rb
+++ b/jwhois.rb
@@ -1,10 +1,8 @@
-require 'formula'
-
 class Jwhois < Formula
-  url 'http://ftpmirror.gnu.org/jwhois/jwhois-4.0.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/jwhois/jwhois-4.0.tar.gz'
-  homepage 'http://directory.fsf.org/project/jwhois/'
-  sha1 '4bd4a35cb0c2593284e7ef161f533a8184645174'
+  url "http://ftpmirror.gnu.org/jwhois/jwhois-4.0.tar.gz"
+  mirror "https://ftp.gnu.org/gnu/jwhois/jwhois-4.0.tar.gz"
+  homepage "http://directory.fsf.org/project/jwhois/"
+  sha256 "fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e"
 
   # No whois entry in /etc/services. Use nicname instead.
   patch :DATA
@@ -14,7 +12,7 @@ def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "LIBS=-liconv"
-    system "make install"
+    system "make", "install"
   end
 end
 
diff --git a/kde-phonon.rb b/kde-phonon.rb
index 4c8529b..c99f074 100644
--- a/kde-phonon.rb
+++ b/kde-phonon.rb
@@ -1,20 +1,20 @@
-require 'formula'
+require "formula"
 
 class KdePhonon < Formula
-  homepage 'http://phonon.kde.org/'
-  url 'ftp://ftp.kde.org/pub/kde/stable/phonon/4.7.1/phonon-4.7.1.tar.xz'
-  sha1 'f1d3214a752d97028dc4ed910a832c1272951522'
+  homepage "http://phonon.kde.org/"
+  url "ftp://ftp.kde.org/pub/kde/stable/phonon/4.7.1/phonon-4.7.1.tar.xz"
+  sha1 "f1d3214a752d97028dc4ed910a832c1272951522"
 
-  depends_on 'cmake' => :build
-  depends_on 'automoc4' => :build
-  depends_on 'qt'
-  depends_on 'glib' => :build
+  depends_on "cmake" => :build
+  depends_on "automoc4" => :build
+  depends_on "qt"
+  depends_on "glib" => :build
 
   keg_only "This package is already supplied by Qt and is only needed by KDE packages."
 
   def install
-    inreplace 'cmake/FindPhononInternal.cmake',
-        'BAD_ALLOCATOR AND NOT WIN32', 'BAD_ALLOCATOR AND NOT APPLE'
+    inreplace "cmake/FindPhononInternal.cmake",
+        "BAD_ALLOCATOR AND NOT WIN32", "BAD_ALLOCATOR AND NOT APPLE"
     system "cmake #{std_cmake_parameters} ."
     system "make install"
   end
diff --git a/kdebase-runtime.rb b/kdebase-runtime.rb
index 95c360a..cd74086 100644
--- a/kdebase-runtime.rb
+++ b/kdebase-runtime.rb
@@ -1,16 +1,16 @@
-require 'formula'
+require "formula"
 
 class KdebaseRuntime < Formula
-  homepage 'http://www.kde.org/'
-  url 'ftp://ftp.kde.org/pub/kde/stable/4.6.0/src/kdebase-runtime-4.6.0.tar.bz2'
-  sha1 '024b7035a410f7c08e501ea1250553e746a469d2'
+  homepage "http://www.kde.org/"
+  url "ftp://ftp.kde.org/pub/kde/stable/4.6.0/src/kdebase-runtime-4.6.0.tar.bz2"
+  sha1 "024b7035a410f7c08e501ea1250553e746a469d2"
 
-  depends_on 'cmake' => :build
-  depends_on 'kde-phonon'
-  depends_on 'oxygen-icons'
+  depends_on "cmake" => :build
+  depends_on "kde-phonon"
+  depends_on "oxygen-icons"
 
   def install
-    phonon = Formula.factory 'kde-phonon'
+    phonon = Formula.factory "kde-phonon"
     system "cmake #{std_cmake_parameters} -DPHONON_INCLUDE_DIR=#{phonon.include} -DPHONON_LIBRARY=#{phonon.lib}/libphonon.dylib -DBUNDLE_INSTALL_DIR=#{bin} ."
     system "make install"
   end
diff --git a/kdelibs.rb b/kdelibs.rb
index 3fc19e0..a69672a 100644
--- a/kdelibs.rb
+++ b/kdelibs.rb
@@ -1,33 +1,33 @@
-require 'formula'
+require "formula"
 
 class Kdelibs < Formula
-  homepage 'http://www.kde.org/'
-  url 'http://download.kde.org/stable/4.9.5/src/kdelibs-4.9.5.tar.xz'
-  sha1 '899a58c5cf2115a1a18fb1690c99b2b3815975c6'
+  homepage "http://www.kde.org/"
+  url "http://download.kde.org/stable/4.9.5/src/kdelibs-4.9.5.tar.xz"
+  sha1 "899a58c5cf2115a1a18fb1690c99b2b3815975c6"
 
-  depends_on 'cmake' => :build
-  depends_on 'automoc4' => :build
-  depends_on 'gettext'
-  depends_on 'pcre'
-  depends_on 'jpeg'
-  depends_on 'giflib'
-  depends_on 'strigi'
-  depends_on 'soprano'
-  depends_on 'shared-desktop-ontologies'
-  depends_on 'shared-mime-info'
-  depends_on 'attica'
-  depends_on 'docbook'
-  depends_on 'd-bus'
-  depends_on 'qt'
-  depends_on 'libdbusmenu-qt'
+  depends_on "cmake" => :build
+  depends_on "automoc4" => :build
+  depends_on "gettext"
+  depends_on "pcre"
+  depends_on "jpeg"
+  depends_on "giflib"
+  depends_on "strigi"
+  depends_on "soprano"
+  depends_on "shared-desktop-ontologies"
+  depends_on "shared-mime-info"
+  depends_on "attica"
+  depends_on "docbook"
+  depends_on "d-bus"
+  depends_on "qt"
+  depends_on "libdbusmenu-qt"
   depends_on :x11
 
   def install
-    gettext_prefix = Formula['gettext'].prefix
-    docbook_prefix = Formula['docbook'].prefix
+    gettext_prefix = Formula["gettext"].prefix
+    docbook_prefix = Formula["docbook"].prefix
     docbook_dtd = "#{docbook_prefix}/docbook/xml/4.5"
     docbook_xsl = Dir.glob("#{docbook_prefix}/docbook/xsl/*").first
-    mkdir 'build' do
+    mkdir "build" do
       system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{gettext_prefix} -DDOCBOOKXML_CURRENTDTD_DIR=#{docbook_dtd} -DDOCBOOKXSL_DIR=#{docbook_xsl} -DBUILD_doc=FALSE -DBUNDLE_INSTALL_DIR=#{bin} .."
       system "make install"
     end
diff --git a/kismet.rb b/kismet.rb
index d6a31a1..9529830 100644
--- a/kismet.rb
+++ b/kismet.rb
@@ -1,10 +1,10 @@
-require 'formula'
+require "formula"
 
 class Kismet < Formula
-  homepage 'http://www.kismetwireless.net'
-  url 'http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz'
-  version '2011-03-R2'
-  sha256 '71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64'
+  homepage "http://www.kismetwireless.net"
+  url "http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz"
+  version "2011-03-R2"
+  sha256 "71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64"
 
   # Strip -rdynamic, per MacPorts
   patch :p0 do
diff --git a/kumofs.rb b/kumofs.rb
index 0ce3725..2ae799a 100644
--- a/kumofs.rb
+++ b/kumofs.rb
@@ -1,23 +1,21 @@
-require 'formula'
-
 class Kumofs < Formula
   desc "Scalable, highly available distributed key-value store"
-  homepage 'http://kumofs.sourceforge.net/'
-  url 'https://github.com/downloads/etolabo/kumofs/kumofs-0.4.12.tar.gz'
-  sha1 'a1e895e42c8d5d75233f2234cf55069e76b4d39b'
+  homepage "http://kumofs.sourceforge.net/"
+  url "https://github.com/downloads/etolabo/kumofs/kumofs-0.4.12.tar.gz"
+  sha256 "afbe4625a1df13ca9353bb6f2e4739de080de0c36cb1945f1e3869eba6e322bd"
 
-  head 'https://github.com/etolabo/kumofs.git'
+  head "https://github.com/etolabo/kumofs.git"
 
-  depends_on 'tokyo-cabinet'
+  depends_on "tokyo-cabinet"
   # msgpack rubygem and the C++ lib are needed
-  depends_on 'msgpack'
-  depends_on 'msgpack' => :ruby
+  depends_on "msgpack"
+  depends_on "msgpack" => :ruby
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-msgpack=#{Formula["msgpack"].opt_prefix}",
                           "--with-tokyocabinet=#{Formula["tokyo-cabinet"].opt_prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/libdlna.rb b/libdlna.rb
index f7801db..50bb094 100644
--- a/libdlna.rb
+++ b/libdlna.rb
@@ -1,11 +1,9 @@
-require 'formula'
-
 class Libdlna < Formula
-  homepage 'http://libdlna.geexbox.org/'
-  url 'http://libdlna.geexbox.org/releases/libdlna-0.2.4.tar.bz2'
-  sha1 '5e86f4443eeb9e7194c808301efeb78611a9e8b3'
+  homepage "http://libdlna.geexbox.org/"
+  url "http://libdlna.geexbox.org/releases/libdlna-0.2.4.tar.bz2"
+  sha256 "4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5"
 
-  depends_on 'ffmpeg'
+  depends_on "ffmpeg"
 
   # Use dylib instead of soname
   patch :DATA
@@ -13,7 +11,7 @@ class Libdlna < Formula
   def install
     system "./configure", "--disable-debug",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
 
diff --git a/libqxt.rb b/libqxt.rb
index d110fa6..12d35b8 100644
--- a/libqxt.rb
+++ b/libqxt.rb
@@ -1,7 +1,7 @@
 class Libqxt < Formula
   homepage "http://libqxt.org/"
   url "http://dev.libqxt.org/libqxt/get/v0.6.2.tar.gz"
-  sha1 "e72a115895d6469972d3f1464bebeab72c497244"
+  sha256 "5ef4267c64a6fa59c1c632b5803924fa40ec6b6556d8a072c868ff7e7a4d647e"
 
   # As of 26/07/2014 this formula is no longer maintained upstream.
   # http://dev.libqxt.org/libqxt/wiki/commits/7e7a0ad676e649bf6f64a2cad1ea6dd204fb766c
@@ -13,7 +13,7 @@ class Libqxt < Formula
   # http://dev.libqxt.org/libqxt-old-hg/issue/50/
   patch do
     url "https://gist.githubusercontent.com/uranusjr/6019051/raw/866c99ee0031ef2ca7fe6b6495120861d1bd5ec8/qxtglobalshortcut_mac.cpp.diff"
-    sha1 "b2e9f4af0f4cc318a053ccf13fc1a6ccbd25cb67"
+    sha256 "9bff7538d6b1616317b3b861bec78403ac32026607dce673b43d7edcb537e115"
   end
 
   def install
diff --git a/librets.rb b/librets.rb
index 48be8b0..74ee3c8 100644
--- a/librets.rb
+++ b/librets.rb
@@ -1,14 +1,14 @@
-require 'formula'
+require "formula"
 
 class Librets < Formula
-  homepage 'http://code.crt.realtors.org/projects/librets'
-  url 'http://www.crt.realtors.org/projects/rets/librets/files/librets-1.5.3.tar.gz'
-  sha1 '2de4d9e9cb26533eb0a9a090b3354a70ed3c41ec'
+  homepage "http://code.crt.realtors.org/projects/librets"
+  url "http://www.crt.realtors.org/projects/rets/librets/files/librets-1.5.3.tar.gz"
+  sha1 "2de4d9e9cb26533eb0a9a090b3354a70ed3c41ec"
 
-  depends_on 'homebrew/versions/boost149'
+  depends_on "homebrew/versions/boost149"
 
   def install
-    old_boost = Formula.factory['boost149']
+    old_boost = Formula.factory["boost149"]
     system "./configure", "--disable-debug",
                           "--enable-shared_dependencies",
                           "--prefix=#{prefix}",
diff --git a/llvm31.rb b/llvm31.rb
index d0588e9..0adc2e5 100644
--- a/llvm31.rb
+++ b/llvm31.rb
@@ -1,38 +1,36 @@
-require 'formula'
-
 class Llvm31 < Formula
-  homepage  'http://llvm.org/'
-  url       'http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz'
-  sha1      '234c96e73ef81aec9a54da92fc2a9024d653b059'
+  homepage "http://llvm.org/"
+  url "http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz"
+  sha256 "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"
 
   option :universal
-  option 'with-clang', 'Build Clang C/ObjC/C++ frontend'
-  option 'disable-shared', "Don't build LLVM as a shared library"
-  option 'all-targets', 'Build all target backends'
-  option 'rtti', 'Build with C++ RTTI'
+  option "with-clang", "Build Clang C/ObjC/C++ frontend"
+  option "disable-shared", "Don't build LLVM as a shared library"
+  option "all-targets", "Build all target backends"
+  option "rtti", "Build with C++ RTTI"
 
   depends_on :python => :recommended
   depends_on MaximumMacOSRequirement => :mountain_lion
 
-  resource 'clang' do
-    url 'http://llvm.org/releases/3.1/clang-3.1.src.tar.gz'
-    sha1 '19f33b187a50d22fda2a6f9ed989699a9a9efd62'
+  resource "clang" do
+    url "http://llvm.org/releases/3.1/clang-3.1.src.tar.gz"
+    sha256 "ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786"
   end
 
   def install
-    if build.with? "python" and build.include? 'disable-shared'
-      raise 'The Python bindings need the shared library.'
+    if build.with?("python") && build.include?("disable-shared")
+      raise "The Python bindings need the shared library."
     end
 
-    (buildpath/'tools/clang').install resource('clang') if build.with? 'clang'
+    (buildpath/"tools/clang").install resource("clang") if build.with? "clang"
 
     if build.universal?
       ENV.permit_arch_flags
-      ENV['UNIVERSAL'] = '1'
-      ENV['UNIVERSAL_ARCH'] = Hardware::CPU.universal_archs.join(' ')
+      ENV["UNIVERSAL"] = "1"
+      ENV["UNIVERSAL_ARCH"] = Hardware::CPU.universal_archs.join(" ")
     end
 
-    ENV['REQUIRES_RTTI'] = '1' if build.include? 'rtti'
+    ENV["REQUIRES_RTTI"] = "1" if build.include? "rtti"
 
     install_prefix = lib/"llvm-#{version}"
 
@@ -44,39 +42,39 @@ def install
       "--disable-bindings",
     ]
 
-    if build.include? 'all-targets'
+    if build.include? "all-targets"
       args << "--enable-targets=all"
     else
       args << "--enable-targets=host"
     end
-    args << "--enable-shared" if not build.include? 'disable-shared'
+    args << "--enable-shared" unless build.include? "disable-shared"
 
     system "./configure", *args
-    system 'make', 'VERBOSE=1'
-    system 'make', 'VERBOSE=1', 'install'
+    system "make", "VERBOSE=1"
+    system "make", "VERBOSE=1", "install"
 
     # Install Clang tools
-    (share/"clang-#{version}/tools").install buildpath/'tools/clang/tools/scan-build', buildpath/'tools/clang/tools/scan-view' if build.with? 'clang'
+    (share/"clang-#{version}/tools").install buildpath/"tools/clang/tools/scan-build", buildpath/"tools/clang/tools/scan-view" if build.with? "clang"
 
     if build.with? "python"
       # Install llvm python bindings.
-      mv buildpath/'bindings/python/llvm', buildpath/"bindings/python/llvm-#{version}"
-      (lib+'python2.7/site-packages').install buildpath/"bindings/python/llvm-#{version}"
+      mv buildpath/"bindings/python/llvm", buildpath/"bindings/python/llvm-#{version}"
+      (lib+"python2.7/site-packages").install buildpath/"bindings/python/llvm-#{version}"
       # Install clang tools and bindings if requested.
-      if build.with? 'clang'
-        mv buildpath/'tools/clang/bindings/python/clang', buildpath/"tools/clang/bindings/python/clang-#{version}"
-        (lib+'python2.7/site-packages').install buildpath/"tools/clang/bindings/python/clang-#{version}"
+      if build.with? "clang"
+        mv buildpath/"tools/clang/bindings/python/clang", buildpath/"tools/clang/bindings/python/clang-#{version}"
+        (lib+"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang-#{version}"
       end
     end
 
     # Link executables to bin and add suffix to avoid conflicts
-    Dir.glob(install_prefix/'bin/*') do |exec_path|
+    Dir.glob(install_prefix/"bin/*") do |exec_path|
       basename = File.basename(exec_path)
       bin.install_symlink exec_path => "#{basename}-#{version}"
     end
 
     # Also link man pages
-    Dir.glob(install_prefix/'share/man/man1/*') do |manpage|
+    Dir.glob(install_prefix/"share/man/man1/*") do |manpage|
       basename = File.basename(manpage, ".1")
       man1.install_symlink manpage => "#{basename}-#{version}.1"
     end
@@ -87,7 +85,7 @@ def install
   end
 
   def caveats
-    if build.with? 'clang'
+    if build.with? "clang"
       "Extra tools are installed in #{HOMEBREW_PREFIX}/share/clang-#{version}."
     end
   end
diff --git a/llvm32.rb b/llvm32.rb
index a0561e6..4d0b3c8 100644
--- a/llvm32.rb
+++ b/llvm32.rb
@@ -1,55 +1,53 @@
-require 'formula'
-
 class Llvm32 < Formula
-  homepage  'http://llvm.org/'
-  url       'http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz'
-  sha1      '42d139ab4c9f0c539c60f5ac07486e9d30fc1280'
+  homepage "http://llvm.org/"
+  url "http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz"
+  sha256 "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
 
   option :universal
-  option 'with-clang', 'Build Clang C/ObjC/C++ frontend'
-  option 'with-asan', 'Include support for -faddress-sanitizer (from compiler-rt)'
-  option 'disable-shared', "Don't build LLVM as a shared library"
-  option 'all-targets', 'Build all target backends'
-  option 'rtti', 'Build with C++ RTTI'
-  option 'disable-assertions', 'Speeds up LLVM, but provides less debug information'
+  option "with-clang", "Build Clang C/ObjC/C++ frontend"
+  option "with-asan", "Include support for -faddress-sanitizer (from compiler-rt)"
+  option "disable-shared", "Don't build LLVM as a shared library"
+  option "all-targets", "Build all target backends"
+  option "rtti", "Build with C++ RTTI"
+  option "disable-assertions", "Speeds up LLVM, but provides less debug information"
 
   depends_on :python => :recommended
-  depends_on 'homebrew/versions/gmp4'
-  depends_on 'homebrew/versions/isl011'
-  depends_on 'homebrew/versions/cloog018'
+  depends_on "homebrew/versions/gmp4"
+  depends_on "homebrew/versions/isl011"
+  depends_on "homebrew/versions/cloog018"
   depends_on MaximumMacOSRequirement => :mountain_lion
 
-  resource 'clang' do
-    url 'http://llvm.org/releases/3.2/clang-3.2.src.tar.gz'
-    sha1 'b0515298c4088aa294edc08806bd671f8819f870'
+  resource "clang" do
+    url "http://llvm.org/releases/3.2/clang-3.2.src.tar.gz"
+    sha256 "2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658"
   end
 
-  resource 'compiler-rt' do
-    url 'http://llvm.org/releases/3.2/compiler-rt-3.2.src.tar.gz'
-    sha1 '718c0249a00e928f8bba32c84771da998ea4d42f'
+  resource "compiler-rt" do
+    url "http://llvm.org/releases/3.2/compiler-rt-3.2.src.tar.gz"
+    sha256 "4ac311df0eead459cbb0f0890c06b55dae529ab45827ac73fef40bec632994aa"
   end
 
-  resource 'polly' do
-    url 'http://llvm.org/releases/3.2/polly-3.2.src.tar.gz'
-    sha1 'b82b3650db710642dfce0c98a49fc0b866b6f152'
+  resource "polly" do
+    url "http://llvm.org/releases/3.2/polly-3.2.src.tar.gz"
+    sha256 "67b5a69b9e3675084bd596228a0e9fd96e3ed0002d9b6f36bb27cfdae54ac192"
   end
 
   def install
-    if build.with? "python" and build.include? 'disable-shared'
-      raise 'The Python bindings need the shared library.'
+    if build.with?("python") && build.include?("disable-shared")
+      raise "The Python bindings need the shared library."
     end
 
-    (buildpath/'tools/polly').install resource('polly')
-    (buildpath/'tools/clang').install resource('clang') if build.with? 'clang'
-    (buildpath/'projects/compiler-rt').install resource('compiler-rt') if build.with? 'asan'
+    (buildpath/"tools/polly").install resource("polly")
+    (buildpath/"tools/clang").install resource("clang") if build.with? "clang"
+    (buildpath/"projects/compiler-rt").install resource("compiler-rt") if build.with? "asan"
 
     if build.universal?
       ENV.permit_arch_flags
-      ENV['UNIVERSAL'] = '1'
-      ENV['UNIVERSAL_ARCH'] = Hardware::CPU.universal_archs.join(' ')
+      ENV["UNIVERSAL"] = "1"
+      ENV["UNIVERSAL_ARCH"] = Hardware::CPU.universal_archs.join(" ")
     end
 
-    ENV['REQUIRES_RTTI'] = '1' if build.include? 'rtti'
+    ENV["REQUIRES_RTTI"] = "1" if build.include? "rtti"
 
     install_prefix = lib/"llvm-#{version}"
 
@@ -61,44 +59,44 @@ def install
       "--disable-bindings",
       "--with-gmp=#{Formula["gmp4"].opt_prefix}",
       "--with-isl=#{Formula["isl011"].opt_prefix}",
-      "--with-cloog=#{Formula["cloog018"].opt_prefix}"
+      "--with-cloog=#{Formula["cloog018"].opt_prefix}",
     ]
 
-    if build.include? 'all-targets'
+    if build.include? "all-targets"
       args << "--enable-targets=all"
     else
       args << "--enable-targets=host"
     end
-    args << "--enable-shared" unless build.include? 'disable-shared'
+    args << "--enable-shared" unless build.include? "disable-shared"
 
-    args << "--disable-assertions" if build.include? 'disable-assertions'
+    args << "--disable-assertions" if build.include? "disable-assertions"
 
-    system './configure', *args
-    system 'make', 'VERBOSE=1'
-    system 'make', 'VERBOSE=1', 'install'
+    system "./configure", *args
+    system "make", "VERBOSE=1"
+    system "make", "VERBOSE=1", "install"
 
     # Install Clang tools
-    (share/"clang-#{version}/tools").install buildpath/'tools/clang/tools/scan-build', buildpath/'tools/clang/tools/scan-view' if build.with? 'clang'
+    (share/"clang-#{version}/tools").install buildpath/"tools/clang/tools/scan-build", buildpath/"tools/clang/tools/scan-view" if build.with? "clang"
 
     if build.with? "python"
       # Install llvm python bindings.
-      mv buildpath/'bindings/python/llvm', buildpath/"bindings/python/llvm-#{version}"
-      (lib+'python2.7/site-packages').install buildpath/"bindings/python/llvm-#{version}"
+      mv buildpath/"bindings/python/llvm", buildpath/"bindings/python/llvm-#{version}"
+      (lib+"python2.7/site-packages").install buildpath/"bindings/python/llvm-#{version}"
       # Install clang tools and bindings if requested.
-      if build.with? 'clang'
-        mv buildpath/'tools/clang/bindings/python/clang', buildpath/"tools/clang/bindings/python/clang-#{version}"
-        (lib+'python2.7/site-packages').install buildpath/"tools/clang/bindings/python/clang-#{version}"
+      if build.with? "clang"
+        mv buildpath/"tools/clang/bindings/python/clang", buildpath/"tools/clang/bindings/python/clang-#{version}"
+        (lib+"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang-#{version}"
       end
     end
 
     # Link executables to bin and add suffix to avoid conflicts
-    Dir.glob(install_prefix/'bin/*') do |exec_path|
+    Dir.glob(install_prefix/"bin/*") do |exec_path|
       basename = File.basename(exec_path)
       bin.install_symlink exec_path => "#{basename}-#{version}"
     end
 
     # Also link man pages
-    Dir.glob(install_prefix/'share/man/man1/*') do |manpage|
+    Dir.glob(install_prefix/"share/man/man1/*") do |manpage|
       basename = File.basename(manpage, ".1")
       man1.install_symlink manpage => "#{basename}-#{version}.1"
     end
@@ -109,7 +107,7 @@ def install
   end
 
   def caveats
-    if build.with? 'clang'
+    if build.with? "clang"
       "Extra tools are installed in #{HOMEBREW_PREFIX}/share/clang-#{version}."
     end
   end
diff --git a/lmutil.rb b/lmutil.rb
index 8d720fc..854a03b 100644
--- a/lmutil.rb
+++ b/lmutil.rb
@@ -1,15 +1,15 @@
-require 'formula'
+require "formula"
 
 class Lmutil < Formula
-  homepage 'http://www.globes.com/support/fnp_utilities_download.htm'
-  url 'http://www.globes.com/products/utilities/v11.11/lmutil_universal_mac10.tar.gz'
-  version '11.11'
-  sha1 '9eb15dd48a79304cec7c03a2716970dea2d047e2'
+  homepage "http://www.globes.com/support/fnp_utilities_download.htm"
+  url "http://www.globes.com/products/utilities/v11.11/lmutil_universal_mac10.tar.gz"
+  version "11.11"
+  sha1 "9eb15dd48a79304cec7c03a2716970dea2d047e2"
 
   def install
-    bin.install 'lmutil'
-    chmod 0755, bin+'lmutil'
-    ln_s bin+'lmutil', bin+'lmstat'
-    ln_s bin+'lmutil', bin+'lmdiag'
+    bin.install "lmutil"
+    chmod 0755, bin+"lmutil"
+    ln_s bin+"lmutil", bin+"lmstat"
+    ln_s bin+"lmutil", bin+"lmdiag"
   end
 end
diff --git a/maatkit.rb b/maatkit.rb
index db54114..3b7c6db 100644
--- a/maatkit.rb
+++ b/maatkit.rb
@@ -1,14 +1,12 @@
-require 'formula'
-
 class Maatkit < Formula
-  homepage 'http://code.google.com/p/maatkit/'
-  url 'https://maatkit.googlecode.com/files/maatkit-7540.tar.gz'
-  sha1 '206f50a29ad7bf6a37e24b8e72a12331895b60aa'
+  homepage "https://code.google.com/p/maatkit/"
+  url "https://maatkit.googlecode.com/files/maatkit-7540.tar.gz"
+  sha256 "618b8ba8f8df1c8ac04d127986a7bb6a834643523000c9c5ea4ee7d95aeef9a8"
 
-  depends_on 'DBD::mysql' => :perl
+  depends_on "DBD::mysql" => :perl
 
   def install
     system "perl Makefile.PL PREFIX=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/mailtomutt.rb b/mailtomutt.rb
index e8e6a77..b9306de 100644
--- a/mailtomutt.rb
+++ b/mailtomutt.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Mailtomutt < Formula
-  url 'https://downloads.sourceforge.net/project/mailtomutt/MailtoMutt/v0.4.1/mailtomutt-0.4.1.tar.bz2'
-  homepage 'http://mailtomutt.sourceforge.net'
-  sha1 '50009431faca36dca2ef8fe61f2caf7e9dd7c3a9'
+  url "https://downloads.sourceforge.net/project/mailtomutt/MailtoMutt/v0.4.1/mailtomutt-0.4.1.tar.bz2"
+  homepage "http://mailtomutt.sourceforge.net"
+  sha256 "138df68ca8b7a2fde047cab898060e4ee4da3d9e5dd856339fcf1a23f086f88e"
 
   def install
     xcodebuild "SYMROOT=build"
diff --git a/mat.rb b/mat.rb
index edece58..90d581e 100644
--- a/mat.rb
+++ b/mat.rb
@@ -13,7 +13,7 @@ class Mat < Formula
   desc "Metadata anonymization toolkit"
   homepage "https://mat.boum.org/"
   url "https://mat.boum.org/files/mat-0.5.2.tar.xz", :using => MatDownloadStrategy
-  sha1 "932ac13863c994ca8874e3271f817efd879e28c3"
+  sha256 "93b850a733373b98965516a743f09de7a1a07a4d40597363517c0fe92c7df113"
 
   depends_on :python => :optional
   depends_on "coreutils"
@@ -32,27 +32,27 @@ class Mat < Formula
 
   resource "hachoir-core" do
     url "https://pypi.python.org/packages/source/h/hachoir-core/hachoir-core-1.3.3.tar.gz"
-    sha1 "e1d3b5da7d57087c922942b7653cb3b195c7769f"
+    sha256 "ecf5d16eccc76b22071d6062e54edb67595f70d827644d3a6dff04289b4058df"
   end
 
   resource "hachoir-parser" do
     url "https://pypi.python.org/packages/source/h/hachoir-parser/hachoir-parser-1.3.4.tar.gz"
-    sha1 "8433e1598b1e8d9404e6978117a203775e68c075"
+    sha256 "775be5e10d72c6122b1ba3202dfce153c09ebcb60080d8edbd51aa89aa4e6b3f"
   end
 
   resource "pdfrw" do
     url "https://pypi.python.org/packages/source/p/pdfrw/pdfrw-0.1.tar.gz"
-    sha1 "9824ad502ecb2bf093fd8727fd7fa2b524140e41"
+    sha256 "8a85cb87b888c030d87cc3fce10ad93e5f99e721b80b99bf50e29a074c048f83"
   end
 
   resource "distutils-extra" do
     url "https://launchpad.net/python-distutils-extra/trunk/2.38/+download/python-distutils-extra-2.38.tar.gz"
-    sha1 "db9ac81daf3e069b8838ae6d379abac2f0094663"
+    sha256 "3d100d5d3492f40b3e7a6a4500f71290bfa91e2c50dc31ba8e3ff9b5d82ca153"
   end
 
   resource "mutagen" do
     url "https://pypi.python.org/packages/source/m/mutagen/mutagen-1.22.tar.gz"
-    sha1 "9bdd4a7a491008e62d140d83fc31d355577f94e7"
+    sha256 "a2ea5b5099ce14ab84c628e9d0a91217df20d2e3459a707f2eba9a354f52da91"
   end
 
   def install
diff --git a/memcachedb.rb b/memcachedb.rb
index 7ef9c25..57687af 100644
--- a/memcachedb.rb
+++ b/memcachedb.rb
@@ -1,17 +1,15 @@
-require 'formula'
-
 class Memcachedb < Formula
-  homepage 'http://memcachedb.org'
-  url 'https://memcachedb.googlecode.com/files/memcachedb-1.2.1-beta.tar.gz'
-  sha1 '6a87ee981808cefc5c1189f08e209be4e85834fd'
+  homepage "http://memcachedb.org"
+  url "https://memcachedb.googlecode.com/files/memcachedb-1.2.1-beta.tar.gz"
+  sha256 "5af99f7970ab71ba287ba9bab61d4c36b69acf290a21f10e0dd1f64b82a9d403"
 
-  depends_on 'berkeley-db4'
-  depends_on 'libevent'
+  depends_on "berkeley-db4"
+  depends_on "libevent"
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--enable-threads"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/metalua.rb b/metalua.rb
index 0d5e528..13c7ff8 100644
--- a/metalua.rb
+++ b/metalua.rb
@@ -1,15 +1,13 @@
-require 'formula'
-
 class Metalua < Formula
-  homepage 'http://metalua.luaforge.net/'
-  url 'https://github.com/fab13n/metalua/archive/0.5-rc2.tar.gz'
-  version '0.5-rc2'
-  sha1 'ee28c801e9673cc11d1cecd0a9fda87e7d21fd6d'
+  homepage "http://metalua.luaforge.net/"
+  url "https://github.com/fab13n/metalua/archive/0.5-rc2.tar.gz"
+  version "0.5-rc2"
+  sha256 "b3ae8202502f50f393c4902638372b602c1f57edbca589cf53e05c0752719e6b"
   revision 1
 
-  head 'https://github.com/fab13n/metalua.git'
+  head "https://github.com/fab13n/metalua.git"
 
-  depends_on 'lua51'
+  depends_on "lua51"
 
   def install
     cd "src" do
diff --git a/metapixel.rb b/metapixel.rb
index 2cc7349..881a4cf 100644
--- a/metapixel.rb
+++ b/metapixel.rb
@@ -1,12 +1,10 @@
-require 'formula'
-
 class Metapixel < Formula
-  homepage 'http://www.complang.tuwien.ac.at/schani/metapixel/'
-  url 'http://www.complang.tuwien.ac.at/schani/metapixel/files/metapixel-1.0.2.tar.gz'
-  sha1 'f917aec91430b1bdbcc7b3dea29cb93f15a04c77'
+  homepage "http://www.complang.tuwien.ac.at/schani/metapixel/"
+  url "http://www.complang.tuwien.ac.at/schani/metapixel/files/metapixel-1.0.2.tar.gz"
+  sha256 "8d77810978da397c070b9b4e228ae6204e9f5c524518ad1a4fcab9462171f55b"
 
-  depends_on 'jpeg'
-  depends_on 'giflib'
+  depends_on "jpeg"
+  depends_on "giflib"
 
   def install
     man1.mkpath
diff --git a/mlkit.rb b/mlkit.rb
index 38538a3..1a48e0a 100644
--- a/mlkit.rb
+++ b/mlkit.rb
@@ -1,22 +1,20 @@
-require 'formula'
-
 class Mlkit < Formula
-  homepage 'http://sourceforge.net/apps/mediawiki/mlkit'
-  url 'https://downloads.sourceforge.net/project/mlkit/mlkit-4.3.7/mlkit-4.3.7.tgz'
-  sha1 '7c1f69f0cde271f50776d33b194699b403bab598'
+  homepage "http://sourceforge.net/apps/mediawiki/mlkit"
+  url "https://downloads.sourceforge.net/project/mlkit/mlkit-4.3.7/mlkit-4.3.7.tgz"
+  sha256 "3fc4342baa0bf5ae9f1afdde4257e295d9756cd2b569107fd4b61da525eb0f73"
 
   depends_on "autoconf" => :build
-  depends_on 'mlton' => :build
+  depends_on "mlton" => :build
   depends_on :tex
-  depends_on 'gmp'
+  depends_on "gmp"
 
   def install
     system "./autobuild; true"
     system "./configure", "--prefix=#{prefix}"
     ENV.m32
-    system "make mlkit"
+    system "make", "mlkit"
     system "make mlkit_libs"
-    system "make install"
+    system "make", "install"
   end
 
   test do
diff --git a/mlton.rb b/mlton.rb
index f4c2d05..b89eb3e 100644
--- a/mlton.rb
+++ b/mlton.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
 # Installs the binary build of MLton.
 # Since MLton is written in ML, building from source
 # would require an existing ML compiler/interpreter for bootstrapping.
@@ -18,21 +16,21 @@ def message; <<-EOS.undent
 end
 
 class Mlton < Formula
-  homepage 'http://mlton.org'
-  url 'https://downloads.sourceforge.net/project/mlton/mlton/20130715/mlton-20130715-1.amd64-darwin.gmp-static.tgz'
-  sha1 'b3b13e0a606bf42d62d4d028687336106ada160a'
+  homepage "http://mlton.org"
+  url "https://downloads.sourceforge.net/project/mlton/mlton/20130715/mlton-20130715-1.amd64-darwin.gmp-static.tgz"
+  sha256 "7c7a660515b44e97993e2330297e1454bb5d5fc01d802ae5579611fe4d9b8de7"
 
   # We download and install the version of MLton which is statically linked to libgmp, but all
   # generated executables will require gmp anyway, hence the dependency
   depends_on StandardHomebrewLocation
-  depends_on 'gmp'
+  depends_on "gmp"
 
   def install
     cd "local" do
       # Remove OS X droppings
       rm Dir["man/man1/._*"]
       mv "man", "share"
-      prefix.install Dir['*']
+      prefix.install Dir["*"]
     end
   end
 end
diff --git a/mpio.rb b/mpio.rb
index 25f8b52..c5a9576 100644
--- a/mpio.rb
+++ b/mpio.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Mpio < Formula
-  homepage 'https://github.com/frsyuki/mpio'
-  url 'https://github.com/downloads/frsyuki/mpio/mpio-0.3.7.tar.gz'
-  sha1 '2c75a7ad0d0e00e9463f768fa4b579626bf65096'
+  homepage "https://github.com/frsyuki/mpio"
+  url "https://github.com/downloads/frsyuki/mpio/mpio-0.3.7.tar.gz"
+  sha256 "ff5c1c3fc901290e73556839c0563de8aa29d6179b9f274f21582587e0c7da2a"
 
   fails_with :clang do
     cause <<-EOS.undent
@@ -18,6 +16,6 @@ class Mpio < Formula
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/msgpack-rpc.rb b/msgpack-rpc.rb
index 213a4ea..13e78c2 100644
--- a/msgpack-rpc.rb
+++ b/msgpack-rpc.rb
@@ -1,16 +1,14 @@
-require 'formula'
-
 class MsgpackRpc < Formula
-  homepage 'https://github.com/msgpack/msgpack-rpc'
-  url 'http://msgpack.org/releases/cpp/msgpack-rpc-0.3.1.tar.gz'
-  sha1 'd11328592bc142863a4e03d86471064a3a0881d3'
+  homepage "https://github.com/msgpack/msgpack-rpc"
+  url "http://msgpack.org/releases/cpp/msgpack-rpc-0.3.1.tar.gz"
+  sha256 "9f54c13e393c6e568ded1b45adec143473caf7284a8013d333fb783ccef921ff"
 
-  depends_on 'msgpack'
-  depends_on 'mpio'
+  depends_on "msgpack"
+  depends_on "mpio"
 
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/mydumper.rb b/mydumper.rb
index 8075eda..a52a3fa 100644
--- a/mydumper.rb
+++ b/mydumper.rb
@@ -1,19 +1,17 @@
-require 'formula'
-
 class Mydumper < Formula
-  homepage 'https://launchpad.net/mydumper'
-  url 'https://launchpad.net/mydumper/0.5/0.5.2/+download/mydumper-0.5.2.tar.gz'
-  sha1 '1eb1a341635c252f9f4cf611af544e0c94b1687d'
+  homepage "https://launchpad.net/mydumper"
+  url "https://launchpad.net/mydumper/0.5/0.5.2/+download/mydumper-0.5.2.tar.gz"
+  sha256 "a7f780f030036eb360488613a220029d59a2e20733641cc9e24ef6f3431e88cd"
 
-  depends_on 'pkg-config' => :build
-  depends_on 'cmake' => :build
+  depends_on "pkg-config" => :build
+  depends_on "cmake" => :build
   depends_on :mysql
-  depends_on 'glib'
-  depends_on 'pcre'
+  depends_on "glib"
+  depends_on "pcre"
 
   def install
     system "cmake", ".", *std_cmake_args
-    system "make install"
+    system "make", "install"
   end
 
   test do
diff --git a/mysqlreport.rb b/mysqlreport.rb
index 9191c77..5d5db1a 100644
--- a/mysqlreport.rb
+++ b/mysqlreport.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Mysqlreport < Formula
-  homepage 'http://hackmysql.com/mysqlreport'
-  url 'http://hackmysql.com/scripts/mysqlreport-3.5.tgz'
-  sha1 '00d2790a9b76422a936f96a622567aa03437b9a3'
+  homepage "http://hackmysql.com/mysqlreport"
+  url "http://hackmysql.com/scripts/mysqlreport-3.5.tgz"
+  sha256 "e2addf769aab7742183a389bbc79d22f4567906e3f2225fbb2481f8e8a8f9fa3"
 
   def install
     bin.install "mysqlreport"
diff --git a/o-make.rb b/o-make.rb
index 01f1282..915c769 100644
--- a/o-make.rb
+++ b/o-make.rb
@@ -1,13 +1,13 @@
-require 'formula'
+require "formula"
 
 class OMake < Formula
-  url 'http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz'
-  homepage 'http://omake.metaprl.org/'
-  sha1 'f714fa992bf391b8bac49a488bc654128962d1cc'
+  url "http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz"
+  homepage "http://omake.metaprl.org/"
+  sha1 "f714fa992bf391b8bac49a488bc654128962d1cc"
   version "0.9.8.6"
 
-  depends_on 'readline'
-  depends_on 'objective-caml'
+  depends_on "readline"
+  depends_on "objective-caml"
 
   # skip all warnings that can happen with newer versions of ocamlc. Also,
   # work around a faulty readline detection, see
diff --git a/oxygen-icons.rb b/oxygen-icons.rb
index a5b31c6..a9837eb 100644
--- a/oxygen-icons.rb
+++ b/oxygen-icons.rb
@@ -1,11 +1,11 @@
-require 'formula'
+require "formula"
 
 class OxygenIcons < Formula
-  homepage 'http://www.oxygen-icons.org/'
-  url 'ftp://ftp.kde.org/pub/kde/stable/4.11.4/src/oxygen-icons-4.11.4.tar.xz'
-  sha1 '52350a2c230142b078dc5dfe95503ec82025c34d'
+  homepage "http://www.oxygen-icons.org/"
+  url "ftp://ftp.kde.org/pub/kde/stable/4.11.4/src/oxygen-icons-4.11.4.tar.xz"
+  sha1 "52350a2c230142b078dc5dfe95503ec82025c34d"
 
-  depends_on 'cmake' => :build
+  depends_on "cmake" => :build
 
   def install
     system "cmake #{std_cmake_parameters} ."
diff --git a/pathfinder.rb b/pathfinder.rb
index d1a6c23..365a1d3 100644
--- a/pathfinder.rb
+++ b/pathfinder.rb
@@ -1,15 +1,15 @@
-require 'formula'
+require "formula"
 
 class Pathfinder < Formula
-  homepage 'http://db.inf.uni-tuebingen.de/research/pathfinder'
-  url 'http://db.inf.uni-tuebingen.de/files/research/pathfinder/download/pathfinder-0.41.tar.gz'
-  sha1 '84f5581688e4c1dff27cf8e7d4354ee594f56970'
+  homepage "http://db.inf.uni-tuebingen.de/research/pathfinder"
+  url "http://db.inf.uni-tuebingen.de/files/research/pathfinder/download/pathfinder-0.41.tar.gz"
+  sha1 "84f5581688e4c1dff27cf8e7d4354ee594f56970"
 
-  option 'enable-debug', 'Enable debugging'
+  option "enable-debug", "Enable debugging"
 
   def install
     args = ["--prefix=#{prefix}"]
-    args << '--enable-debug' if build.include? 'enable-debug'
+    args << "--enable-debug" if build.include? "enable-debug"
 
     system "./configure", *args
     system "make"
diff --git a/pjsip.rb b/pjsip.rb
index 1269854..c5cb580 100644
--- a/pjsip.rb
+++ b/pjsip.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Pjsip < Formula
-  homepage 'http://www.pjsip.org'
-  url 'http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2'
-  sha1 '244884fb900594104792c431946384e0fedc9560'
+  homepage "http://www.pjsip.org"
+  url "http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2"
+  sha256 "ac86d2401e1cb4a4f0207e4fd58921f869d0b5ee65a26aa438039a107ba415a5"
 
   # 1. We aren't cross compiling
   #    pjsip thinks we are, this is fixed somewhere between revision 4305 and
@@ -16,7 +14,7 @@ class Pjsip < Formula
   def install
     ENV.j1
     system "./configure", "--prefix=#{prefix}"
-    Pathname('pjlib/include/pj/config_site.h').write <<-EOS.undent
+    Pathname("pjlib/include/pj/config_site.h").write <<-EOS.undent
       #define PJ_CONFIG_MAXIMUM_SPEED
       #include <pj/config_site_sample.h>
 
diff --git a/plowshare3.rb b/plowshare3.rb
index d6e40e2..d7b226e 100644
--- a/plowshare3.rb
+++ b/plowshare3.rb
@@ -1,21 +1,21 @@
-require 'formula'
+require "formula"
 
 class Plowshare3 < Formula
-  homepage 'https://code.google.com/p/plowshare/'
-  url 'https://plowshare.googlecode.com/files/plowshare3-snapshot-git20131103.89c1220.tar.gz'
-  version '3.GIT-89c1220'
-  sha1 'cbaedf3284eadbb069825b390fdec8955242bbb3'
+  homepage "https://code.google.com/p/plowshare/"
+  url "https://plowshare.googlecode.com/files/plowshare3-snapshot-git20131103.89c1220.tar.gz"
+  version "3.GIT-89c1220"
+  sha1 "cbaedf3284eadbb069825b390fdec8955242bbb3"
 
-  conflicts_with 'plowshare'
+  conflicts_with "plowshare"
 
-  depends_on 'recode'
-  depends_on 'imagemagick'
-  depends_on 'tesseract'
-  depends_on 'spidermonkey'
-  depends_on 'aview'
-  depends_on 'coreutils'
-  depends_on 'gnu-sed'
-  depends_on 'gnu-getopt'
+  depends_on "recode"
+  depends_on "imagemagick"
+  depends_on "tesseract"
+  depends_on "spidermonkey"
+  depends_on "aview"
+  depends_on "coreutils"
+  depends_on "gnu-sed"
+  depends_on "gnu-getopt"
 
   patch :DATA
 
diff --git a/pngwriter.rb b/pngwriter.rb
index f3bc68d..993df18 100644
--- a/pngwriter.rb
+++ b/pngwriter.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Pngwriter < Formula
-  url 'https://downloads.sourceforge.net/project/pngwriter/pngwriter/pngwriter-0.5.4/pngwriter-0.5.4.zip'
-  homepage 'http://pngwriter.sourceforge.net/'
-  sha1 '9dc7275ec1320eb8d5d02db3d7cb04a3d40c9619'
+  url "https://downloads.sourceforge.net/project/pngwriter/pngwriter/pngwriter-0.5.4/pngwriter-0.5.4.zip"
+  homepage "http://pngwriter.sourceforge.net/"
+  sha256 "d8b99b9bdd794a9709373812aedd4f89530e387224465b2ae0cd88dfefeeee2f"
 
   def install
     # the zip file contains one more directory
diff --git a/pulse.rb b/pulse.rb
index e82dc9d..03d5596 100644
--- a/pulse.rb
+++ b/pulse.rb
@@ -12,12 +12,12 @@ def install
 
     # FIXTHIS: do this without mutating the cache!
     hack_dir = cached_download/".gopath/src/source.ind.ie/project/"
-    rm_rf  hack_dir
+    rm_rf hack_dir
     mkdir_p hack_dir
     ln_s cached_download, "#{hack_dir}/pulse"
 
     system "./build.sh", "noupgrade"
-    prefix.install %w{ CONTRIBUTING.md LICENSE README.md }
+    prefix.install %w[ CONTRIBUTING.md LICENSE README.md ]
     bin.install "pulse"
   end
 
diff --git a/pure.rb b/pure.rb
index f48ffed..f400a05 100644
--- a/pure.rb
+++ b/pure.rb
@@ -1,7 +1,7 @@
 class Pure < Formula
   homepage "http://purelang.bitbucket.org/"
   url "https://bitbucket.org/purelang/pure-lang/downloads/pure-0.64.tar.gz"
-  sha1 "738d25de30a20bbdd0722aeb923d6be9051b730f"
+  sha256 "efd55229342aec9d79e8fa4732a30f140e1773064f3869abde053e01468f7b07"
 
   needs :cxx11
 
@@ -12,7 +12,7 @@ class Pure < Formula
 
   resource "docs" do
     url "https://bitbucket.org/purelang/pure-lang/downloads/pure-docs-0.64.tar.gz"
-    sha1 "a7cea453195046621497be5ea1d33dce3cb677cc"
+    sha256 "a140456f7d6feff8a15f5505a8fa3f9376afef88f1831ca98b93dc1d1764d110"
   end
 
   def install
diff --git a/pyenv-pip-rehash.rb b/pyenv-pip-rehash.rb
index c1c3ec2..b9029b0 100644
--- a/pyenv-pip-rehash.rb
+++ b/pyenv-pip-rehash.rb
@@ -1,7 +1,7 @@
 class PyenvPipRehash < Formula
   homepage "https://github.com/yyuu/pyenv-pip-rehash"
   url "https://github.com/yyuu/pyenv-pip-rehash/archive/v0.0.4.tar.gz"
-  sha1 "afbce380b888c987138f28d33fe1ba5a38cdb41a"
+  sha256 "ea61e859425d1330a6683dc2962f9974021381ca78871ab3a15c2cc442c00593"
 
   head "https://github.com/yyuu/pyenv-pip-rehash.git"
 
@@ -13,6 +13,6 @@ def install
   end
 
   test do
-    %x(pyenv hooks exec).include?("pip.bash")
+    `pyenv hooks exec`.include?("pip.bash")
   end
 end
diff --git a/qfits.rb b/qfits.rb
index e81f089..d62a00a 100644
--- a/qfits.rb
+++ b/qfits.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Qfits < Formula
-  homepage 'http://www.eso.org/sci/software/eclipse/qfits/index.html'
-  url 'ftp://ftp.eso.org/pub/qfits/qfits-6.2.0.tar.gz'
-  sha1 '9e05023316ebc307b8191068dc07d6fd449ac14d'
+  homepage "http://www.eso.org/sci/software/eclipse/qfits/index.html"
+  url "ftp://ftp.eso.org/pub/qfits/qfits-6.2.0.tar.gz"
+  sha256 "3271469f8c50310ed88d1fd62a07c8bbd5b361e102def1dce3478d1a6b104b54"
 
   def install
     # qfits does not support 64bit build
@@ -11,6 +9,6 @@ def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}"
-    system "make install"
+    system "make", "install"
   end
 end
diff --git a/qimageblitz.rb b/qimageblitz.rb
index 2a7b6bf..fa56bf1 100644
--- a/qimageblitz.rb
+++ b/qimageblitz.rb
@@ -1,12 +1,12 @@
-require 'formula'
+require "formula"
 
 class Qimageblitz < Formula
-  homepage 'http://www.kde.org'
-  url 'ftp://ftp.kde.org/pub/kde/stable/qimageblitz/qimageblitz-0.0.6.tar.bz2'
-  sha1 '32bcda9adb262ef49c62e3a7adbfcdeec98f72e4'
+  homepage "http://www.kde.org"
+  url "ftp://ftp.kde.org/pub/kde/stable/qimageblitz/qimageblitz-0.0.6.tar.bz2"
+  sha1 "32bcda9adb262ef49c62e3a7adbfcdeec98f72e4"
 
-  depends_on 'cmake' => :build
-  depends_on 'qt'
+  depends_on "cmake" => :build
+  depends_on "qt"
 
   def install
     system "cmake #{std_cmake_parameters} ."
diff --git a/qiv.rb b/qiv.rb
index bb2bea5..31cc9b0 100644
--- a/qiv.rb
+++ b/qiv.rb
@@ -1,19 +1,17 @@
-require 'formula'
-
 class Qiv < Formula
   desc "Quick image viewer for X"
-  homepage 'http://spiegl.de/qiv/'
-  url 'http://spiegl.de/qiv/download/qiv-2.3.1.tgz'
-  sha1 '8f8455951047ed41c773b9214375d02f7acaf814'
+  homepage "http://spiegl.de/qiv/"
+  url "http://spiegl.de/qiv/download/qiv-2.3.1.tgz"
+  sha256 "675396b539e6511135fe73c867f9fdd6d912c24c7562797cb047c27d0c2c8ee6"
 
-  head 'http://bitbucket.org/ciberandy/qiv/', :using => :hg
+  head "http://bitbucket.org/ciberandy/qiv/", :using => :hg
 
-  depends_on 'pkg-config' => :build
-  depends_on 'gtk+'
-  depends_on 'imlib2'
-  depends_on 'libmagic'
-  depends_on 'little-cms2'
-  depends_on 'libexif'
+  depends_on "pkg-config" => :build
+  depends_on "gtk+"
+  depends_on "imlib2"
+  depends_on "libmagic"
+  depends_on "little-cms2"
+  depends_on "libexif"
 
   def install
     system "make", 'STATUSBAR_FONT="Monaco"', "CC=#{ENV.cc}"
diff --git a/rocket.rb b/rocket.rb
index 5fb1832..f5e9b35 100644
--- a/rocket.rb
+++ b/rocket.rb
@@ -6,14 +6,14 @@ class Rocket < Formula
   head "https://github.com/coreos/rocket.git"
 
   url "https://github.com/coreos/rocket/archive/v0.1.0.tar.gz"
-  sha1 "04ae8cb9bac04eedacb03a7531e6b251556be653"
+  sha256 "594bfdf68efe7e675c12a2bcf19ae33bd22453375ede446256e4e892e0a228d0"
 
   depends_on "go" => :build
   depends_on "squashfs" => :build
 
   go_resource "github.com/jteeuwen/go-bindata" do
     url "https://github.com/jteeuwen/go-bindata/archive/v3.0.7.tar.gz"
-    sha1 "b348b4f39204a31a87fd396ea1418e2ef5b07e90"
+    sha256 "77a7214479e5ce9004e4afa6d0eb8ce14289030fadc55a3444249ab1fe2c7980"
   end
 
   def install