diff --git a/.gitignore b/.gitignore
index 412920612..1a6265601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ config/application.rb
 .rvmrc
 
 app/assets/javascripts/.DS_Store
+
+Gemfile.lock
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 2bea8fce9..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,318 +0,0 @@
-GIT
-  remote: git://github.com/amatsuda/kaminari.git
-  revision: 82a38e07db1ca1598c8daf073a8f6be22ae714d6
-  specs:
-    kaminari (0.13.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-
-PATH
-  remote: vendor/impressionist
-  specs:
-    impressionist (1.1.1)
-      httpclient (~> 2.2)
-      nokogiri (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.4)
-      actionpack (= 3.1.4)
-      mail (~> 2.3.0)
-    actionpack (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-    activesupport (3.1.4)
-      multi_json (~> 1.0)
-    archive-tar-minitar (0.5.2)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-x86-mingw32)
-    brakeman (1.5.1)
-      activesupport
-      erubis (~> 2.6)
-      haml (~> 3.0)
-      i18n
-      ruby2ruby (~> 1.2)
-      ruport (~> 1.6)
-      sass (~> 3.0)
-    bson (1.6.1)
-    bson_ext (1.6.1)
-      bson (~> 1.6.1)
-    builder (3.0.0)
-    carrierwave (0.5.8)
-      activesupport (~> 3.0)
-    carrierwave-mongoid (0.1.3)
-      carrierwave (>= 0.5.6)
-      mongoid (~> 2.1)
-    chronic (0.6.7)
-    coffee-rails (3.1.1)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.2.0)
-    color (1.4.1)
-    columnize (0.3.6)
-    database_cleaner (0.7.1)
-    delorean (1.2.0)
-      chronic
-    devise (1.5.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    diff-lcs (1.1.3)
-    encrypted_strings (0.3.3)
-    erubis (2.7.0)
-    event-calendar (2.3.3)
-    exception_notification (2.5.2)
-      actionmailer (>= 3.0.4)
-    execjs (1.3.0)
-      multi_json (~> 1.0)
-    factory_girl (2.6.3)
-      activesupport (>= 2.3.9)
-    factory_girl_rails (1.7.0)
-      factory_girl (~> 2.6.0)
-      railties (>= 3.0.0)
-    fastercsv (1.5.4)
-    haml (3.1.4)
-    hike (1.2.1)
-    hoe (2.16.1)
-      rake (~> 0.8)
-    httpclient (2.2.5)
-    i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    jquery-ui-rails (0.4.0)
-      jquery-rails
-      railties (>= 3.1.0)
-    json (1.6.5)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    mongo (1.6.1)
-      bson (~> 1.6.1)
-    mongo_session_store-rails3 (3.0.5)
-      actionpack (>= 3.0)
-      mongo
-    mongoid (2.4.6)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    mongoid-encryptor (0.0.5)
-      activesupport (~> 3.0)
-      encrypted_strings (~> 0.3.3)
-      mongoid (~> 2)
-    mongoid-tree (0.7.0)
-      mongoid (~> 2.0)
-    multi_json (1.1.0)
-    nokogiri (1.5.2)
-    nokogiri (1.5.2-x86-mingw32)
-    orm_adapter (0.0.6)
-    pdf-writer (1.1.8)
-      color (>= 1.4.0)
-      transaction-simple (~> 1.3)
-    polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-protection (1.2.0)
-      rack
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    radius (0.7.3)
-    rails (3.1.4)
-      actionmailer (= 3.1.4)
-      actionpack (= 3.1.4)
-      activerecord (= 3.1.4)
-      activeresource (= 3.1.4)
-      activesupport (= 3.1.4)
-      bundler (~> 1.0)
-      railties (= 3.1.4)
-    railties (3.1.4)
-      actionpack (= 3.1.4)
-      activesupport (= 3.1.4)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.20.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-restriction (0.3.0)
-      resque (>= 1.7.0)
-    resque-scheduler (1.9.9)
-      redis (>= 2.0.1)
-      resque (>= 1.8.0)
-      rufus-scheduler
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.8.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    rubyzip (0.9.6.1)
-    rufus-scheduler (2.0.16)
-      tzinfo (>= 0.3.23)
-    ruport (1.6.3)
-      fastercsv
-      pdf-writer (= 1.1.8)
-    sass (3.1.15)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    sexp_processor (3.1.0)
-    shoulda-matchers (1.0.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    spork (0.9.0)
-    spork (0.9.0-x86-mingw32)
-      win32-process
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    subexec (0.2.1)
-    thor (0.14.6)
-    tilt (1.3.3)
-    tinymce-rails (3.4.8)
-      railties (>= 3.1)
-    transaction-simple (1.4.0)
-      hoe (>= 1.1.7)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    uglifier (1.2.3)
-      execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.1.1)
-      rack (>= 1.0)
-    watchr (0.7)
-    win32-api (1.4.8-x86-mingw32)
-    win32-process (0.6.5)
-      windows-pr (>= 1.1.2)
-    windows-api (0.4.1)
-      win32-api (>= 1.4.5)
-    windows-pr (1.2.1)
-      win32-api (>= 1.4.5)
-      windows-api (>= 0.3.0)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  brakeman
-  bson_ext
-  carrierwave
-  carrierwave-mongoid
-  coffee-rails
-  database_cleaner
-  delorean
-  devise (= 1.5.3)
-  event-calendar
-  exception_notification
-  execjs
-  factory_girl_rails
-  impressionist!
-  jquery-rails
-  jquery-ui-rails
-  kaminari!
-  mini_magick
-  mongo_session_store-rails3
-  mongoid
-  mongoid-encryptor
-  mongoid-tree
-  nokogiri
-  radius
-  rails (>= 3.1.0, < 3.2.0)
-  rake
-  resque
-  resque-restriction
-  resque-scheduler
-  rspec (~> 2.0)
-  rspec-rails (~> 2.0)
-  ruby-debug19
-  rubyzip
-  sass-rails
-  shoulda-matchers
-  simplecov
-  sinatra
-  spork
-  sprockets
-  tinymce-rails
-  uglifier
-  watchr