diff --git a/.rvmrc b/.rvmrc
index 51ac4685d..e60a6df01 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -6,7 +6,7 @@
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
 #     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p194@growstuffdev"
+environment_id="ruby-2.0.0-p451@growstuffdev"
 
 # Uncomment the following lines if you want to verify rvm version per project
 # rvmrc_rvm_version="1.14.10 (stable)" # 1.10.1 seams as a safe start
diff --git a/Gemfile b/Gemfile
index 3898993d4..d919aa542 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby "1.9.3"
+ruby "2.0.0"
 
 gem 'bundler', '>=1.1.5'
 
@@ -46,7 +46,7 @@ group :assets do
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # long term, we'll probably want node.js for performance, but this will do
   # for now as it's easier for new people to install
-  gem 'therubyracer', '~> 0.10.2', :platforms => :ruby
+  gem "therubyracer", "~> 0.12", :platforms => :ruby
   # Another CSS preprocessor, used for Bootstrap overrides
   gem "less-rails"
   # CSS framework
diff --git a/Gemfile.lock b/Gemfile.lock
index d2b1201cd..373c7c6df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,19 +58,19 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    arel (3.0.2)
-    bcrypt-ruby (3.1.1)
-    better_errors (1.0.1)
+    arel (3.0.3)
+    bcrypt (3.1.7)
+    better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
-    bootstrap-datepicker-rails (1.1.1.3)
+    bootstrap-datepicker-rails (1.3.0.2)
       railties (>= 3.0)
     builder (3.0.4)
     cancan (1.6.10)
-    chunky_png (1.2.8)
+    chunky_png (1.3.0)
     coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -78,111 +78,114 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    colorize (0.5.8)
-    columnize (0.3.6)
-    commonjs (0.2.6)
-    compass (0.12.2)
+    coffee-script-source (1.7.0)
+    columnize (0.8.9)
+    commonjs (0.2.7)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
+      sass (~> 3.2.19)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    coveralls (0.6.7)
-      colorize
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     csv_shaper (1.0.0)
       activesupport (>= 3.0.0)
-    dalli (2.6.4)
+    dalli (2.7.0)
     debug_inspector (0.0.2)
-    debugger (1.6.1)
+    debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
+      debugger-ruby_core_source (~> 1.3.2)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
-    devise (3.0.0)
-      bcrypt-ruby (~> 3.0)
+    debugger-ruby_core_source (1.3.2)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.1.3)
+    docile (1.1.3)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    execjs (2.0.2)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.4.1)
+      factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    flickraw (0.9.6)
-    friendly_id (4.0.9)
+    flickraw (0.9.8)
+    friendly_id (4.0.10.1)
+      activerecord (>= 3.0, < 4.0)
     fssm (0.2.10)
-    gibbon (1.0.0)
+    gibbon (1.1.2)
       httparty
       multi_json (>= 1.3.4)
-    gravatar-ultimate (1.0.3)
-    haml (4.0.3)
+    gravatar-ultimate (2.0.0)
+      activesupport (>= 2.3.14)
+      rack
+    haml (4.0.5)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hashie (2.0.5)
+    hashie (2.1.1)
     hike (1.2.3)
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
-    kgio (2.8.0)
-    leaflet-markercluster-rails (0.6.0)
+    kgio (2.9.2)
+    leaflet-markercluster-rails (0.7.0)
       railties (>= 3.1)
-    leaflet-rails (0.6.2)
-    less (2.3.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.3.3)
+    leaflet-rails (0.7.2)
+    less (2.5.0)
+      commonjs (~> 0.2.7)
+    less-rails (2.5.0)
       actionpack (>= 3.1)
-      less (~> 2.3.1)
-    libv8 (3.3.10.4)
+      less (~> 2.5.0)
+    libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcachier (0.0.2)
-    mime-types (1.23)
-    mini_portile (0.5.1)
-    multi_json (1.7.7)
+    mime-types (1.25.1)
+    mini_portile (0.5.3)
+    multi_json (1.9.3)
     multi_xml (0.5.5)
-    newrelic_rpm (3.6.5.130)
-    nokogiri (1.6.0)
+    newrelic_rpm (3.8.0.218)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
-    omniauth-flickr (0.0.11)
+      rack (~> 1.0)
+    omniauth-flickr (0.0.13)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.0.0)
+    omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    orm_adapter (0.4.0)
-    pg (0.15.1)
-    polyglot (0.3.3)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
+    polyglot (0.3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -197,7 +200,7 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.1)
+    rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
     railties (3.2.13)
       actionpack (= 3.2.13)
@@ -206,10 +209,11 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.11.0)
-    rake (10.1.0)
+    raindrops (0.13.0)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
+    ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec-core (2.12.2)
@@ -223,33 +227,39 @@ GEM
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    sass (3.2.9)
+    sass (3.2.19)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thor (0.18.1)
+    sqlite3 (1.3.9)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    treetop (1.4.14)
+    tins (1.1.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.1.2)
+    tzinfo (0.3.39)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.6.3)
+    unicorn (4.8.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -259,7 +269,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.4)
+    will_paginate (3.0.5)
 
 PLATFORMS
   ruby
@@ -306,7 +316,7 @@ DEPENDENCIES
   rspec-rails (~> 2.12.1)
   sass-rails (~> 3.2.3)
   sqlite3
-  therubyracer (~> 0.10.2)
+  therubyracer (~> 0.12)
   twitter-bootstrap-rails!
   uglifier (>= 1.0.3)
   unicorn