Merge branch 'master' into event-palette

Rakefile

@@ -124,7 +124,7 @@ task :benchmark do
 end
 
 task :nof do
-  system %{find . -name *spec.coffee | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}
+  system %{find . -name *spec.coffee | grep -v atom-build | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}
 end
 
 def application_path

script/bootstrap

@@ -15,16 +15,7 @@ exit_unless_npm_exists() {
   fi
 }
 
-exit_unless_brew_exists() {
-  if ! hash brew 2> /dev/null; then
-    echo "ERROR: Atom requires brew"
-    exit 1
-  fi
-}
-
 exit_unless_xcode_exists
 exit_unless_npm_exists
-exit_unless_brew_exists
 
 npm install
-brew install tools/gyp-formula.rb

tools/gyp-formula.rb

@@ -1,21 +0,0 @@
-# Adapted from https://github.com/mxcl/homebrew/pull/11776/files
-
-require 'formula'
-
-class GypFormula < Formula
-  homepage 'http://code.google.com/p/gyp/'
-  url 'http://gyp.googlecode.com/svn/trunk', :revision => 1518
-  version 'trunk-1518'
-  head 'http://gyp.googlecode.com/svn/trunk'
-
-  def install
-    system "python", "setup.py", "install",
-      "--prefix=#{prefix}", "--install-purelib=#{libexec}",
-      "--install-platlib=#{libexec}", "--install-scripts=#{bin}"
-
-    mv bin + 'gyp', bin + 'gyp.py'
-    mv Dir[bin + '*'], libexec
-
-    bin.install_symlink "#{libexec}/gyp.py" => "gyp"
-  end
-end