diff --git a/Gemfile b/Gemfile
index 1552a3153..ee2dcaa11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,38 +76,37 @@ group :development do
   gem 'guard-rubocop', '~> 1.1.0'
 end
 
-group :test do
+group :development, :test do
   gem 'capybara', '~> 2.4.1'
   # For feature testing
   # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
+  gem 'phantomjs-binaries', '~> 1.9.2.4'
   gem 'phantomjs', '~> 1.9.7.1', require: 'phantomjs/poltergeist'
   gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
-  gem 'phantomjs-binaries', '~> 1.9.2.4'
 
   # For cleaning db in feature and epp tests
   gem 'database_cleaner', '~> 1.3.0'
 
+  # EPP client
+  gem 'epp', '~> 1.4.0'
+
   # Replacement for fixtures
   gem 'fabrication', '~> 2.11.3'
 
   # Library to generate fake data
   gem 'faker', '~> 1.3.0'
 
+  # For debugging
+  gem 'pry', '~> 0.10.1'
+  gem 'pry-byebug', '~> 1.3.3'
+
   # Testing framework
   gem 'rspec-rails', '~> 3.0.2'
 
   # Additional matchers for RSpec
   gem 'shoulda-matchers', '~> 2.6.1', require: false
-end
-
-group :development, :test do
-  # EPP client
-  gem 'epp', '~> 1.4.0'
-
-  # For debugging
-  gem 'pry', '~> 0.10.1'
-  gem 'pry-byebug', '~> 1.3.3'
 
   # For unique IDs (used by the epp gem)
   gem 'uuidtools', '~> 2.1.4'
 end
+
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..c4d3fcffb
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,298 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      mail (~> 2.5.4)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    bootstrap-sass (3.2.0.2)
+      sass (~> 3.2)
+    builder (3.2.2)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
+    capybara (2.4.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    cliver (0.3.2)
+    coderay (1.1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    columnize (0.8.9)
+    database_cleaner (1.3.0)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.5)
+    epp (1.4.0)
+      hpricot
+      libxml-ruby
+    erubis (2.7.0)
+    execjs (2.2.1)
+    fabrication (2.11.3)
+    faker (1.3.0)
+      i18n (~> 0.5)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    guard-rubocop (1.1.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    haml (4.0.5)
+      tilt
+    haml-rails (0.5.3)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 3.1, < 5.0)
+      railties (>= 4.0.1)
+    hike (1.2.3)
+    hitimes (1.2.2)
+    hpricot (0.8.6)
+    i18n (0.6.11)
+    isikukood (0.1.2)
+    jbuilder (2.1.3)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    kaminari (0.16.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kgio (2.9.2)
+    libv8 (3.16.14.5)
+    libxml-ruby (2.7.0)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    multi_json (1.10.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    nprogress-rails (0.1.3.1)
+    parser (2.2.0.pre.4)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    pg (0.17.1)
+    phantomjs (1.9.7.1)
+    phantomjs-binaries (1.9.2.4)
+      sys-uname (= 0.9.0)
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    polyamorous (1.1.0)
+      activerecord (>= 3.0)
+    polyglot (0.3.5)
+    powerpack (0.0.9)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (1.3.3)
+      byebug (~> 2.7)
+      pry (~> 0.10)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.0.0)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    ransack (1.3.0)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (4.1.2)
+      json (~> 1.4)
+    ref (1.0.5)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    rubocop (0.26.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.4, < 3.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.5.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    shoulda-matchers (2.6.2)
+      activesupport (>= 3.0.0)
+    simpleidn (0.0.5)
+    slop (3.6.0)
+    spring (1.1.3)
+    sprockets (2.11.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sys-uname (0.9.0)
+      ffi (>= 1.0.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    turbolinks (2.3.0)
+      coffee-rails
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+    uuidtools (2.1.5)
+    websocket-driver (0.3.4)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootstrap-sass (~> 3.2.0.1)
+  capybara (~> 2.4.1)
+  coffee-rails (~> 4.0.0)
+  database_cleaner (~> 1.3.0)
+  epp (~> 1.4.0)
+  fabrication (~> 2.11.3)
+  faker (~> 1.3.0)
+  guard (~> 2.6.1)
+  guard-rspec (~> 4.3.1)
+  guard-rubocop (~> 1.1.0)
+  haml-rails (~> 0.5.3)
+  isikukood
+  jbuilder (~> 2.0)
+  jquery-rails
+  kaminari (~> 0.16.1)
+  nokogiri (~> 1.6.2.1)
+  nprogress-rails (~> 0.1.3.1)
+  pg
+  phantomjs (~> 1.9.7.1)
+  phantomjs-binaries (~> 1.9.2.4)
+  poltergeist (~> 1.5.1)
+  pry (~> 0.10.1)
+  pry-byebug (~> 1.3.3)
+  rails (= 4.1.4)
+  ransack (~> 1.3.0)
+  rspec-rails (~> 3.0.2)
+  sass-rails (~> 4.0.3)
+  sdoc (~> 0.4.0)
+  shoulda-matchers (~> 2.6.1)
+  simpleidn (~> 0.0.5)
+  spring
+  therubyracer
+  turbolinks
+  uglifier (>= 1.3.0)
+  unicorn
+  uuidtools (~> 2.1.4)