diff --git a/.gitignore b/.gitignore
index 4badd80a..88bbe15c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,9 @@ doc
 .yardoc
 
 # bundler
-.bundle
+/.bundle
+/Gemfile.lock
+/vendor/bundle
 
 # rspec logs
 log
diff --git a/.travis.yml b/.travis.yml
index 99e43836..d8f19639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: ruby
 rvm:
- - 1.8.7
  - 1.9.3
  - 2.0.0
  - 2.1
diff --git a/Gemfile b/Gemfile
index a8f69469..9f3abd68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,5 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'devtools', git: 'https://github.com/mbj/devtools.git'
+  gem 'pry'
 end
-
-# Added by devtools
-eval_gemfile 'Gemfile.devtools'
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index da94939f..00000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,305 +0,0 @@
-GIT
-  remote: https://github.com/mbj/devtools.git
-  revision: 54d9559790d1c077367db089342027e34f9f1bd3
-  specs:
-    devtools (0.0.2)
-      coveralls (~> 0.7.2)
-      flay (~> 2.5.0)
-      flog (~> 4.3.0)
-      mutant (~> 0.7.5)
-      mutant-rspec (~> 0.7.4)
-      rake (~> 10.4.0)
-      reek (= 1.4.0)
-      rspec (~> 3.1.0)
-      rspec-core (~> 3.1.7)
-      rspec-its (~> 1.1.0)
-      rubocop (~> 0.28.0)
-      simplecov (~> 0.9.1)
-      yard (~> 0.8.7.6)
-      yardstick (~> 0.9.9)
-
-PATH
-  remote: .
-  specs:
-    formtastic-bootstrap (3.1.0)
-      formtastic (>= 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract_type (0.0.7)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    ammeter (0.2.9)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (>= 2.2)
-      rspec-rails (>= 2.2)
-    anima (0.2.0)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.8)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    builder (3.0.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    coveralls (0.7.9)
-      multi_json (~> 1.10)
-      rest-client (~> 1.7)
-      simplecov (~> 0.9.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    equalizer (0.0.9)
-    erubis (2.7.0)
-    ffi (1.9.6)
-    flay (2.5.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
-    flog (4.3.2)
-      ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.4)
-    formatador (0.2.5)
-    formtastic (3.1.3)
-      actionpack (>= 3.2.13)
-    guard (2.10.5)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-      guard-compat (~> 1.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.5.0)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    hike (1.2.3)
-    hitimes (1.2.2)
-    i18n (0.7.0)
-    ice_nine (0.11.1)
-    journey (1.0.4)
-    json (1.8.2)
-    libnotify (0.9.1)
-      ffi (>= 1.0.11)
-    listen (2.8.5)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    morpher (0.2.3)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      anima (~> 0.2.0)
-      ast (~> 2.0.0)
-      concord (~> 0.1.4)
-      equalizer (~> 0.0.9)
-      ice_nine (~> 0.11.0)
-      procto (~> 0.0.2)
-    multi_json (1.10.1)
-    mutant (0.7.6)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      anima (~> 0.2.0)
-      ast (~> 2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2)
-      equalizer (~> 0.0.9)
-      ice_nine (~> 0.11.1)
-      memoizable (~> 0.4.2)
-      morpher (~> 0.2.3)
-      parallel (~> 1.3)
-      parser (~> 2.2.0.2)
-      procto (~> 0.0.2)
-      unparser (~> 0.2.2)
-    mutant-rspec (0.7.6)
-      mutant (~> 0.7.6)
-      rspec-core (>= 3.0.0, < 3.2.0)
-    nenv (0.2.0)
-    netrc (0.10.2)
-    nokogiri (1.5.11)
-    parallel (1.3.4)
-    parser (2.2.0.2)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.0.9)
-    procto (0.0.2)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    racc (1.4.12)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fchange (0.0.6)
-      ffi
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-notifu (0.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    reek (1.4.0)
-      rainbow (>= 1.99, < 3.0)
-      ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (>= 3.5.0, < 4.0)
-      sexp_processor (~> 4.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-its (1.1.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rspec_tag_matchers (1.0.0)
-      nokogiri (>= 1.4.0)
-      rspec-rails (>= 1.2.6)
-    rubocop (0.28.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    ruby2ruby (2.1.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.6.4)
-      sexp_processor (~> 4.1)
-    rubysl-logger (2.1.0)
-    rubysl-open-uri (2.0.0)
-    rubysl-prettyprint (2.0.3)
-    rubysl-singleton (2.0.0)
-    sexp_processor (4.4.5)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    terminal-notifier-guard (1.6.4)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
-    tins (1.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unparser (0.2.2)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.0.2)
-      procto (~> 0.0.2)
-    yard (0.8.7.6)
-    yardstick (0.9.9)
-      yard (~> 0.8, >= 0.8.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.2)
-  ammeter (~> 0.2)
-  bundler
-  devtools!
-  formtastic-bootstrap!
-  guard (~> 2.10.3)
-  guard-bundler (~> 2.1.0)
-  guard-rspec (~> 4.5.0)
-  guard-rubocop (~> 1.2.0)
-  jruby-openssl (~> 0.9.4)
-  json (~> 1.8.1)
-  libnotify (~> 0.9.0)
-  listen (~> 2.8.4)
-  nokogiri (< 1.6.0)
-  racc (~> 1.4.12)
-  rake
-  rb-fchange (~> 0.0.6)
-  rb-fsevent (~> 0.9.4)
-  rb-inotify (~> 0.9.5)
-  rb-notifu (~> 0.0.4)
-  rspec_tag_matchers (~> 1.0)
-  rubysl-logger (~> 2.1.0)
-  rubysl-open-uri (~> 2.0.0)
-  rubysl-prettyprint (~> 2.0.3)
-  rubysl-singleton (~> 2.0.0)
-  terminal-notifier-guard (~> 1.6.4)
-  tzinfo
diff --git a/VERSION b/VERSION
index fd2a0186..94ff29cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/formtastic-bootstrap.gemspec b/formtastic-bootstrap.gemspec
index 889bf151..78d90fa7 100644
--- a/formtastic-bootstrap.gemspec
+++ b/formtastic-bootstrap.gemspec
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('tzinfo')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('nokogiri', ["< 1.6.0"])
+  s.add_development_dependency('nokogiri')
+  s.add_development_dependency('rspec', ["~> 3.0"])
+  s.add_development_dependency('rspec-rails', ["~> 3.0"])
   s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"])
   s.add_development_dependency('ammeter', ["~> 0.2"])
   s.add_development_dependency('actionpack', ["~> 3.2"])
diff --git a/lib/formtastic-bootstrap/version.rb b/lib/formtastic-bootstrap/version.rb
index b2ebec7f..fd11c1be 100644
--- a/lib/formtastic-bootstrap/version.rb
+++ b/lib/formtastic-bootstrap/version.rb
@@ -1,3 +1,3 @@
 module FormtasticBootstrap
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end