diff --git a/Gemfile.lock b/Gemfile.lock
index 787692ba1..6a65327cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/amatsuda/kaminari.git
-  revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
+  revision: 5f62aa596658f444da336d409c4d104672fa0b6e
   specs:
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: git://github.com/charlotte-ruby/impressionist.git
-  revision: 0894f6a550a33f83f4937d655e9f0774521781e4
+  revision: d5f29fe8256887c041cd2304369e70d8cec22a67
   specs:
     impressionist (1.2.0)
       httpclient (~> 2.2)
@@ -17,12 +17,12 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -30,44 +30,41 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-<<<<<<< HEAD
     attr_required (0.0.5)
     bcrypt-ruby (3.0.0)
-=======
-    bcrypt-ruby (3.0.1)
->>>>>>> f530fcc... change page number of archive
     binding_of_caller (0.7.1)
       debug_inspector (>= 0.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    brakeman (1.9.2)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
+    brakeman (1.9.4)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
-      haml (~> 3.0)
+      haml (>= 3.0, < 5.0)
       highline (~> 1.6)
       multi_json (~> 1.2)
       ruby2ruby (~> 2.0)
       ruby_parser (~> 3.1.1)
       sass (~> 3.0)
+      slim (~> 1.3.6)
       terminal-table (~> 1.4)
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
+    bson (1.8.3)
+    bson_ext (1.8.3)
+      bson (~> 1.8.3)
     builder (3.0.4)
     capybara (2.0.2)
       mime-types (>= 1.16)
@@ -82,44 +79,34 @@ GEM
     carrierwave-mongoid (0.2.2)
       carrierwave (~> 0.6.1)
       mongoid (~> 2.1)
-    childprocess (0.3.8)
+    childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     chinese_pinyin (0.4.1)
-    chronic (0.9.0)
-<<<<<<< HEAD
+    chronic (0.9.1)
     coderay (1.0.9)
-=======
-    coderay (1.0.8)
->>>>>>> f530fcc... change page number of archive
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.6.1)
     columnize (0.3.6)
-    curb (0.8.3)
     database_cleaner (0.9.1)
     debug_inspector (0.0.2)
-<<<<<<< HEAD
-    debugger (1.2.4)
-=======
-    debugger (1.2.3)
->>>>>>> f530fcc... change page number of archive
+    debugger (1.5.0)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
     delorean (2.1.0)
       chronic
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     encrypted_strings (0.3.3)
     erubis (2.7.0)
     exception_notification (3.0.1)
@@ -135,66 +122,39 @@ GEM
       i18n (~> 0.5)
     fastercsv (1.5.5)
     fattr (2.2.1)
-<<<<<<< HEAD
-    fb_graph (2.6.4)
+    fb_graph (2.6.5)
       httpclient (>= 2.2.0.2)
       multi_json (>= 1.3)
       rack-oauth2 (>= 0.14.4)
       tzinfo
     ffi (1.4.0)
-    haml (3.1.8)
-=======
-    feedzirra (0.0.24)
-      activesupport (>= 2.3.8)
-      builder (>= 2.1.2)
-      curb (>= 0.2.3)
-      loofah (>= 0.3.1)
-      nokogiri (> 0.0.0)
-      sax-machine (>= 0.0.12)
-    ffi (1.2.0)
-    haml (3.1.7)
-    hashie (1.2.0)
->>>>>>> f530fcc... change page number of archive
-    highline (1.6.15)
+    haml (4.0.0)
+      tilt
+    highline (1.6.16)
     hike (1.2.1)
-    httpclient (2.3.2)
+    httpclient (2.3.3)
     i18n (0.6.1)
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.1)
+    jquery-ui-rails (4.0.2)
       jquery-rails
       railties (>= 3.1.0)
-<<<<<<< HEAD
     json (1.7.7)
-=======
-    json (1.7.6)
-    libv8 (3.11.8.13)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    loofah (1.2.1)
-      nokogiri (>= 1.4.4)
->>>>>>> f530fcc... change page number of archive
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     method_source (0.8.1)
-<<<<<<< HEAD
     mime-types (1.21)
     mini_magick (3.5.0)
-=======
-    mime-types (1.19)
-    mini_magick (3.4)
->>>>>>> f530fcc... change page number of archive
       subexec (~> 0.2.1)
-    mocha (0.10.5)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
+    mongo (1.8.3)
+      bson (~> 1.8.3)
     mongo_session_store-rails3 (3.0.6)
       actionpack (>= 3.0)
       mongo
@@ -208,83 +168,73 @@ GEM
       mongoid (~> 2)
     mongoid-tree (0.7.0)
       mongoid (~> 2.0)
-    multi_json (1.6.1)
+    multi_json (1.7.1)
     net-ldap (0.3.1)
-    nokogiri (1.5.6)
+    nokogiri (1.5.7)
     options (2.3.0)
       fattr
     orm_adapter (0.0.7)
     polyglot (0.3.3)
     pr_geohash (1.0.0)
-    progress_bar (0.4.0)
+    progress_bar (1.0.0)
       highline (~> 1.6.1)
       options (~> 2.3.0)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
-    pry-remote (0.1.6)
+    pry-remote (0.1.7)
       pry (~> 0.9)
       slop (~> 3.0)
     pry-stack_explorer (0.4.9)
       binding_of_caller (>= 0.7)
       pry (~> 0.9.11)
-<<<<<<< HEAD
     rack (1.4.5)
-=======
-    rack (1.4.4)
->>>>>>> f530fcc... change page number of archive
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-oauth2 (1.0.0)
+    rack-oauth2 (1.0.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
       i18n
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-protection (1.3.2)
+    rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     radius (0.7.3)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-<<<<<<< HEAD
-    rdoc (3.12.1)
-=======
-    rb-readline (0.4.2)
-    rdoc (3.12)
->>>>>>> f530fcc... change page number of archive
+    rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.2)
+    redis (3.0.3)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
     redis-search (0.9.0)
       chinese_pinyin (>= 0.3.0)
       redis (>= 2.1.1)
       redis-namespace (>= 1.0.2)
-    ref (1.0.2)
-    resque (1.23.0)
+    resque (1.23.1)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
@@ -298,59 +248,56 @@ GEM
     rmmseg-cpp-huacnlee (0.2.9)
     rsolr (1.0.8)
       builder (>= 2.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     ruby2ruby (2.0.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.1.1)
+    ruby_parser (3.1.2)
       sexp_processor (~> 4.1)
     rubyzip (0.9.9)
-    rufus-scheduler (2.0.17)
+    rufus-scheduler (2.0.18)
       tzinfo (>= 0.3.23)
-    sass (3.2.5)
+    sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-<<<<<<< HEAD
-    selenium-webdriver (2.30.0)
-=======
-    sax-machine (0.1.0)
-      nokogiri (> 0.0.0)
-    selenium-webdriver (2.27.2)
->>>>>>> f530fcc... change page number of archive
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sexp_processor (4.1.5)
-    shoulda-matchers (1.4.2)
+    sexp_processor (4.2.0)
+    shoulda-matchers (1.5.1)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
+      bourne (~> 1.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.4)
+    sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    social-share-button (0.1.1)
+    slim (1.3.6)
+      temple (~> 0.5.5)
+      tilt (~> 1.3.3)
+    slop (3.4.4)
+    social-share-button (0.1.2)
     spork (0.9.2)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -368,19 +315,17 @@ GEM
     sunspot_rails (1.3.3)
       nokogiri
       sunspot (= 1.3.3)
-    sunspot_solr (1.3.3)
+    sunspot_solr (2.0.0)
+    temple (0.5.5)
     terminal-table (1.4.5)
-    therubyracer (0.11.3)
-      libv8 (~> 3.11.8.12)
-      ref
     thor (0.17.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
+    tilt (1.3.6)
+    tinymce-rails (3.5.8.1)
       railties (>= 3.1.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -412,16 +357,11 @@ DEPENDENCIES
   execjs
   factory_girl_rails
   faker
-<<<<<<< HEAD
   fb_graph
-=======
-  feedzirra
->>>>>>> f530fcc... change page number of archive
   impressionist!
   jquery-rails (= 2.1.4)
   jquery-ui-rails
   kaminari!
-  libv8 (~> 3.11.8)
   mime-types
   mini_magick
   mongo_session_store-rails3 (= 3.0.6)
@@ -438,7 +378,6 @@ DEPENDENCIES
   radius
   rails (~> 3.2.9)
   rake
-  rb-readline
   redis (>= 2.1.1)
   redis-namespace
   redis-search
@@ -459,7 +398,6 @@ DEPENDENCIES
   sunspot-rails-tester
   sunspot_mongo
   sunspot_solr
-  therubyracer
   tinymce-rails
   uglifier
   watchr