Merge branch 'master' into heroku

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	README.md

Gemfile

@@ -2,7 +2,8 @@ source "https://rubygems.org"
 
 ruby "2.1.8"
 
-gem 'rails', '~> 3.2.21'
+gem 'rails', '3.2.21'
+gem 'rake', '< 11.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -35,7 +36,7 @@ group :test do
   gem 'shoulda'
   gem 'mocha', require: false
   gem 'test-unit'
-  gem 'csvlint', github: 'theodi/csvlint.rb'
+  gem 'csvlint', git: 'https://github.com/theodi/csvlint.rb.git', ref: '3dc689f4625c8edd4f7b725d1d420fdd67a67df9'
   gem 'vcr'
   gem 'webmock'
   gem 'shoulda-context'
@@ -51,7 +52,7 @@ end
 group :development do
   gem 'guard', '~> 1.8.3'
   gem 'guard-test'
-  # gem 'spring', github: 'jonleighton/spring'
+  # gem 'spring', git: 'https://github.com/jonleighton/spring.git'
   gem 'terminal-notifier-guard'
   gem 'ruby-prof'
   gem 'rails-footnotes', '>= 3.7.9'
@@ -77,13 +78,11 @@ group :production do
   gem 'rails_12factor'
 end
 
-group :surveyor do
-  gem 'fastercsv', '~> 1.5.4'
-  gem 'formtastic', '~> 2.1.0'
-  gem 'uuidtools', '~> 2.1'
-  gem 'mustache', '0.99.4'
-  gem 'rabl', '~>0.6.13'
-end
+gem 'uuidtools', '~> 2.1'
+gem 'fastercsv', '~> 1.5.4'
+gem 'formtastic', '~> 2.1.0'
+gem 'mustache', '0.99.4'
+gem 'rabl', '~>0.6.13'
 
 gem 'jquery-rails'
 
@@ -121,15 +120,15 @@ gem 'redcarpet'
 gem "devise", "3.0.3"
 gem 'dotenv-rails'
 gem 'httparty'
-gem 'data_kitten', github: 'theodi/data_kitten' #, path: '../data_kitten'
+gem 'data_kitten', git: 'https://github.com/theodi/data_kitten.git', ref: '0597206bc522a03110f8fe89be111589dcecf6b6'
 gem 'delayed_job_active_record'
 gem 'linkeddata'
 gem 'rack-linkeddata'
 gem 'jbuilder'
 gem 'rack-cors', require: 'rack/cors'
-gem 'alternate_rails', :github => 'theodi/alternate-rails'
+gem 'alternate_rails', git: 'https://github.com/theodi/alternate-rails.git', ref: "188889d66c5df1d7d13f7c6e53e8088e3503dea1"
 gem 'fog'
-gem 'juvia_rails', github: 'theodi/juvia_rails'
+gem 'juvia_rails', git: 'https://github.com/theodi/juvia_rails.git', ref: '94f982aa8188a18bc0f37c16218c85e890d25294'
 gem 'domainatrix'
 # newrelic appears to be adding significant performance problems
 #gem 'newrelic_rpm'

Gemfile.lock

@@ -1,13 +1,15 @@
 GIT
-  remote: git://github.com/theodi/alternate-rails.git
+  remote: https://github.com/theodi/alternate-rails.git
   revision: 188889d66c5df1d7d13f7c6e53e8088e3503dea1
+  ref: 188889d66c5df1d7d13f7c6e53e8088e3503dea1
   specs:
     alternate_rails (0.0.1)
       rails (~> 3.2.13)
 
 GIT
-  remote: git://github.com/theodi/csvlint.rb.git
+  remote: https://github.com/theodi/csvlint.rb.git
   revision: 3dc689f4625c8edd4f7b725d1d420fdd67a67df9
+  ref: 3dc689f4625c8edd4f7b725d1d420fdd67a67df9
   specs:
     csvlint (0.0.1)
       activesupport
@@ -17,8 +19,9 @@ GIT
       open_uri_redirections
 
 GIT
-  remote: git://github.com/theodi/data_kitten.git
+  remote: https://github.com/theodi/data_kitten.git
   revision: 0597206bc522a03110f8fe89be111589dcecf6b6
+  ref: 0597206bc522a03110f8fe89be111589dcecf6b6
   specs:
     data_kitten (1.3.3)
       datapackage
@@ -30,8 +33,9 @@ GIT
       rest-client
 
 GIT
-  remote: git://github.com/theodi/juvia_rails.git
+  remote: https://github.com/theodi/juvia_rails.git
   revision: 94f982aa8188a18bc0f37c16218c85e890d25294
+  ref: 94f982aa8188a18bc0f37c16218c85e890d25294
   specs:
     juvia_rails (0.0.1)
       rails (~> 3.2.1)
@@ -109,7 +113,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    colorize (0.7.7)
+    colorize (0.8.1)
     columnize (0.9.0)
     commonjs (0.2.7)
     connection_pool (2.2.0)
@@ -224,18 +228,18 @@ GEM
     httparty (0.13.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.8.1)
     jbuilder (2.0.4)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     journey (1.0.4)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     json-ld (1.1.9)
       rdf (~> 1.1, >= 1.1.7)
-    json-schema (2.6.1)
+    json-schema (2.6.2)
       addressable (~> 2.3.8)
     json_spec (1.0.3)
       multi_json (~> 1.0)
@@ -299,7 +303,7 @@ GEM
     mini_portile (0.6.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -319,7 +323,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    open_uri_redirections (0.1.4)
+    open_uri_redirections (0.2.1)
     orm_adapter (0.5.0)
     parallel (1.6.1)
     parallel_tests (1.7.0)
@@ -340,8 +344,8 @@ GEM
     rabl (0.6.14)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
-    rack (1.4.5)
-    rack-cache (1.2)
+    rack (1.4.7)
+    rack-cache (1.7.0)
       rack (>= 0.4)
     rack-cors (0.4.0)
     rack-linkeddata (1.1.0)
@@ -351,7 +355,7 @@ GEM
       rack
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.21)
       actionmailer (= 3.2.21)
@@ -378,7 +382,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     ransack (1.1.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -525,7 +529,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.19.1)
+    thor (0.19.4)
     tilt (1.4.1)
     timecop (0.7.1)
     timers (4.0.1)
@@ -535,7 +539,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     twitter-bootstrap-rails-confirm (1.0.2)
-    tzinfo (0.3.44)
+    tzinfo (0.3.53)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -610,10 +614,11 @@ DEPENDENCIES
   rabl (~> 0.6.13)
   rack-cors
   rack-linkeddata
-  rails (~> 3.2.21)
+  rails (= 3.2.21)
   rails-footnotes (>= 3.7.9)
   rails-i18n (~> 3.0.0)
   rails_12factor
+  rake (< 11.0)
   ransack
   redcarpet
   rspec-rails (~> 2.14.2)