diff --git a/Gemfile.lock b/Gemfile.lock
index ec0958a1..81285ce2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,6 @@ PATH
   remote: vendor
   specs:
     travis-core (0.0.1)
-      actionmailer (~> 3.2.19)
       activerecord (~> 3.2.19)
       coder (~> 0.4.0)
       data_migrations (~> 0.0.1)
@@ -119,9 +118,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      mail (~> 2.5.4)
     actionpack (3.2.22.2)
       activemodel (= 3.2.22.2)
       activesupport (= 3.2.22.2)
@@ -230,9 +226,6 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
     memcachier (0.0.2)
     memoist (0.14.0)
     metaclass (0.0.4)
@@ -253,7 +246,6 @@ GEM
     net-http-pipeline (1.0.1)
     os (0.9.6)
     pg (0.18.4)
-    polyglot (0.3.5)
     proxies (0.2.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -358,9 +350,6 @@ GEM
     tool (0.2.3)
     travis-config (0.1.4)
       hashr (~> 0.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (0.3.49)
     uber (0.0.15)
     unicorn (5.1.0)
diff --git a/Rakefile b/Rakefile
index a48da4b0..27b2da1b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,6 +25,11 @@ end
 
 # not sure how else to include the spec_helper
 namespace :spec do
+  desc 'Run all specs'
+  task :api do
+    sh 'bundle exec rspec -r spec_helper spec spec_core'
+  end
+
   desc 'Run api specs'
   task :api do
     sh 'bundle exec rspec -r spec_helper spec'
@@ -36,7 +41,7 @@ namespace :spec do
   end
 end
 
-task :default => %w(spec:api spec:core)
+task :default => :'spec:all'
 
 desc "generate gemspec"
 task 'travis-api.gemspec' do
diff --git a/vendor/travis-core/lib/travis.rb b/vendor/travis-core/lib/travis.rb
index fbe09549..7db92f49 100644
--- a/vendor/travis-core/lib/travis.rb
+++ b/vendor/travis-core/lib/travis.rb
@@ -20,8 +20,6 @@ require 'travis/commit_command'
 #                  events and send out such things as email, pusher, irc
 #                  notifications, archive builds or queue jobs for the
 #                  workers.
-# travis/mailer  - contains ActionMailers for sending out email
-#                  notifications
 #
 # travis-core also contains some helper classes and modules like Travis::Database
 # (needed in travis-hub in order to connect to the database) and Travis::Renderer
diff --git a/vendor/travis-core/travis-core.gemspec b/vendor/travis-core/travis-core.gemspec
index c189c19f..5eb06b14 100644
--- a/vendor/travis-core/travis-core.gemspec
+++ b/vendor/travis-core/travis-core.gemspec
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'thor'
   s.add_dependency 'activerecord',      '~> 3.2.19'
-  s.add_dependency 'actionmailer',      '~> 3.2.19'
   s.add_dependency 'railties',          '~> 3.2.19'
   s.add_dependency 'rollout',           '~> 1.1.0'
   s.add_dependency 'coder',             '~> 0.4.0'