diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..7d2ed7c7
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.1.4
diff --git a/.travis.yml b/.travis.yml
index 56e79126..4bc87dd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,17 @@
-sudo: false
 language: ruby
+sudo: false
+rvm:
+- 2.1.4
 env:
   global:
-    - RUBY_GC_MALLOC_LIMIT=90000000
-    - RUBY_GC_HEAP_FREE_SLOTS=200000
-rvm:
-  - 2.1.2
+  - RUBY_GC_MALLOC_LIMIT=90000000
+  - RUBY_GC_HEAP_FREE_SLOTS=200000
+cache: bundler
 addons:
   postgresql: 9.3
+services:
+- redis
 before_script:
-  - 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
-
+- 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
 notifications:
   irc: "irc.freenode.org#travis"
-services:
-  - redis
-cache: bundler
-sudo: false
diff --git a/Gemfile b/Gemfile
index a7998671..d92fda3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,3 @@
-ruby '2.1.2' if ENV.key?('DYNO')
-
 source 'https://rubygems.org'
 gemspec
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e50684c..1e6dbf5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 797edde6d0d009c827523a765ab84262fa6d56db
+  revision: 08ec0c4d0cf3366cd971d4acd9aadbc0db68f85d
   specs:
     travis-yaml (0.1.0)
 
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 8e3615c6..6f8d3185 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -12,15 +12,15 @@ Gem::Specification.new do |s|
     "Piotr Sarnacki",
     "Konstantin Haase",
     "Sven Fuchs",
-    "Mathias Meyer",
     "Hiro Asari",
+    "Mathias Meyer",
     "Josh Kalderimis",
     "Henrik Hodne",
     "Andre Arko",
     "Erik Michaels-Ober",
+    "Dan Buch",
     "Steve Richert",
     "Brian Ford",
-    "Patrick Williams",
     "Bryan Goldstein",
     "Puneeth Chaganti",
     "Thais Camilo and Konstantin Haase",
@@ -29,15 +29,16 @@ Gem::Specification.new do |s|
     "James Dennes",
     "rainsun",
     "Dan Rice",
-    "Nick Schonning"
+    "Nick Schonning",
+    "Patrick Williams"
   ]
 
   s.email = [
     "drogus@gmail.com",
     "konstantin.mailinglists@googlemail.com",
     "me@svenfuchs.com",
-    "meyer@paperplanes.de",
     "asari.ruby@gmail.com",
+    "meyer@paperplanes.de",
     "josh.kalderimis@gmail.com",
     "me@henrikhodne.com",
     "henrik@hodne.io",
@@ -45,19 +46,20 @@ Gem::Specification.new do |s|
     "andre@arko.net",
     "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
-    "henrik@travis-ci.com",
+    "dan@travis-ci.org",
     "steve.richert@gmail.com",
     "bford@engineyard.com",
-    "nschonni@gmail.com",
-    "brysgo@gmail.com",
+    "henrik@travis-ci.com",
     "punchagan@muse-amuse.in",
-    "e@zzak.io",
-    "jdennes@gmail.com",
     "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
+    "e@zzak.io",
+    "jdennes@gmail.com",
     "dan@zoombody.com",
-    "patrick@bittorrent.com"
+    "nschonni@gmail.com",
+    "patrick@bittorrent.com",
+    "brysgo@gmail.com"
   ]
 
   s.files = [
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/middleware/metriks.rb",
     "lib/travis/api/app/middleware/rewrite.rb",
     "lib/travis/api/app/middleware/scope_check.rb",
+    "lib/travis/api/app/middleware/user_agent_tracker.rb",
     "lib/travis/api/app/responders.rb",
     "lib/travis/api/app/responders/atom.rb",
     "lib/travis/api/app/responders/badge.rb",
@@ -241,6 +244,7 @@ Gem::Specification.new do |s|
     "spec/unit/helpers/json_renderer_spec.rb",
     "spec/unit/middleware/logging_spec.rb",
     "spec/unit/middleware/scope_check_spec.rb",
+    "spec/unit/middleware/user_agent_tracker_spec.rb",
     "spec/unit/responders/json_spec.rb",
     "spec/unit/responders/service_spec.rb",
     "tmp/.gitkeep",