random cleanup

app/controllers/users_controller.rb

@@ -8,7 +8,7 @@ class UsersController < ApplicationController
   before_filter :correct_user,   only: [:edit, :update]
   before_filter :admin_user,     only: :destroy
 
-  rescue_from 'JamRuby::PermissionError' do |exception|
+  rescue_from 'PermissionError' do |exception|
     @exception = exception
     render :file => 'public/403.html', :status => 403, :layout => false
   end

config/application.rb

@@ -119,10 +119,10 @@ if defined?(Bundler)
 
     if Rails.env == 'production'
         config.desk_url = 'https://jamkazam.desk.com'
-        config.multipass_callback_url = "https://jamkazam.desk.com/customer/authentication/multipass/callback"
+        config.multipass_callback_url = "http://jamkazam.desk.com/customer/authentication/multipass/callback"
     else
         config.desk_url = 'https://jamkazam.desk.com' # TODO: replace with test URL
-        config.multipass_callback_url = "https://jamkazam.desk.com/customer/authentication/multipass/callback"
+        config.multipass_callback_url = "http://jamkazam.desk.com/customer/authentication/multipass/callback"
     end
 
     # perf_data configs

config/routes.rb

@@ -6,8 +6,6 @@ SampleApp::Application.routes.draw do
   end
 
   resources :users
-  resources :music_sessions
-  resources :friend_requests
 
   resources :sessions, only: [:new, :create, :destroy]