Merge branch 'master' into sass-scanner

3 files changed, 16 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 7c29c56..59bb791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 rvm:
   - 1.8.7
-  - 1.9.2
+  - ree
   - 1.9.3
+  - 2.0.0
+  - ruby-head
   - jruby-18mode
   - jruby-19mode
+  - jruby-head
   - rbx-18mode
   - rbx-19mode
-  - ruby-head  # test again later: RedCloth not compiling
-  - jruby-head
-  - ree
 branches:
   only:
     - master
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
 script: "rake test" # test:scanners"
diff --git a/Gemfile b/Gemfile
index 508f1e8..15a71ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,8 @@ group :development do
   gem "bundler", ">= 1.0.0"
   gem "rake"
   gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3"
-  gem "term-ansicolor", '= 1.1.1'
-  gem "shoulda-context", "~> 1.0.0"
+  gem "term-ansicolor", '~> 1.2.2'
+  gem "shoulda-context", "~> 1.1.2"
   gem "json" if RUBY_VERSION < '1.9'
   gem "rdoc"
 end
diff --git a/README.markdown b/README.markdown
index b5ae9e2..f333655 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,8 @@
-# CodeRay [![Build Status](https://travis-ci.org/rubychan/coderay.png)](https://travis-ci.org/rubychan/coderay) [![Gem Version](https://badge.fury.io/rb/coderay.png)](http://badge.fury.io/rb/coderay)
+# CodeRay
+
+[![Build Status](https://travis-ci.org/rubychan/coderay.png)](https://travis-ci.org/rubychan/coderay)
+[![Gem Version](https://badge.fury.io/rb/coderay.png)](http://badge.fury.io/rb/coderay)
+[![Dependency Status](https://gemnasium.com/rubychan/coderay.png)](https://gemnasium.com/rubychan/coderay)
 
 ## About
 
@@ -12,7 +16,7 @@ You put your code in, and you get it back colored; Keywords, strings, floats, co
 
 ### Dependencies
 
-CodeRay needs Ruby 1.8.7+ or 1.9.2+. It also runs on Rubinius and JRuby.
+CodeRay needs Ruby 1.8.7, 1.9.3 or 2.0. It also runs on JRuby.
 
 ## Example Usage