diff --git a/Gemfile b/Gemfile
index 72609e69..81bd9e5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 # Build and doc tools
-gem 'rake', '~> 10.0.3', require: false
+gem 'rake', '~> 10.3.2', require: false
 gem 'yard', '~> 0.8.0', require: false
 
 # Test tools
 gem 'cucumber', '~> 1.3.15'
 gem 'fivemat', '~> 1.3.1'
-gem 'aruba', '~> 0.5.4'
+gem 'aruba', '~> 0.6.0'
 gem 'rspec', '~> 3.0'
 gem 'simplecov'
 
diff --git a/README.md b/README.md
index f04689af..a753fcad 100644
--- a/README.md
+++ b/README.md
@@ -62,11 +62,13 @@ Additionally, up-to-date generated code documentation is available on [RubyDoc].
 
 ## Build & Dependency Status
 
-[![Gem Version](http://img.shields.io/gem/v/middleman.svg)][gem]
-[![Build Status](http://img.shields.io/travis/middleman/middleman.svg)][travis]
-[![Code Coverage](http://img.shields.io/coveralls/middleman/middleman.svg)][coveralls]
-[![Dependency Status](http://img.shields.io/gemnasium/middleman/middleman.svg)][gemnasium]
-[![Code Quality](http://img.shields.io/codeclimate/github/middleman/middleman.svg)][codeclimate]
+[![Gem Version](http://img.shields.io/gem/v/middleman.svg?style=flat)][gem]
+[![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)][license]
+[![Dependency Status](http://img.shields.io/gemnasium/middleman/middleman.svg?style=flat)][gemnasium]
+[![Build Status](http://img.shields.io/travis/middleman/middleman.svg?style=flat)][travis]
+[![Code Coverage](http://img.shields.io/coveralls/middleman/middleman.svg?style=flat)][coveralls]
+[![Code Quality](http://img.shields.io/codeclimate/github/middleman/middleman.svg?style=flat)][codeclimate]
+[![Gittip](http://img.shields.io/gittip/middleman.svg?style=flat)][gittip]
 
 ## Community
 
@@ -115,6 +117,7 @@ Copyright (c) 2010-2014 Thomas Reynolds. MIT Licensed, see [LICENSE] for details
 [coveralls]: https://coveralls.io/r/middleman/middleman
 [gemnasium]: https://gemnasium.com/middleman/middleman
 [codeclimate]: https://codeclimate.com/github/middleman/middleman
+[gittip]: https://www.gittip.com/middleman/
 [rubyinstaller]: http://rubyinstaller.org/
 [rubydoc]: http://rubydoc.info/github/middleman/middleman
 [LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE.md