Update ecosystem for new devise

Gemfile

@@ -23,18 +23,20 @@ group :assets do
   #gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
-  gem 'mustache' #, :require => 'mustache/railtie'
+  #gem 'mustache' #, :require => 'mustache/railtie'
 end
 
 gem 'jquery-rails'
-gem 'haml-rails'
+gem 'jquery-ui-rails'
+gem 'ember-rails'
 gem 'slim-rails'
 #gem 'less-rails'
 
-gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
-gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
-gem 'devise', '2.0.4'
-gem 'devise_simply_stored'
+gem 'couch_potato' , github: 'bterkuile/couch_potato'
+gem 'simply_stored' , github: 'bterkuile/simply_stored'
+gem 'orm_adapter', github: 'bterkuile/orm_adapter'
+gem 'devise', '3.1.0' #, '2.0.4'
+gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem 'simple_form'
 gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 gem 'cmtool', github: 'bterkuile/cmtool'
@@ -50,17 +52,17 @@ gem 'mini_magick'
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'
 group :development do
-  gem 'pry'
   #gem 'pry-remote'
   gem 'rspec-rails'
   gem 'guard-rspec'
   gem 'quiet_assets'
   gem 'letter_opener'
   gem 'thin'
+  gem 'faye'
+  gem 'pry-rails'
 end
 
 group :test do
-  gem 'pry'
   #gem 'steak'
   gem 'rspec-rails'
   gem 'cucumber-rails'
@@ -71,6 +73,7 @@ group :test do
   gem 'ruby_gntp'
   gem 'guard-rspec'
   gem 'factory_girl_rails'
+  gem 'pry-rails'
 end
 
 # Use unicorn as the app server