diff --git a/.coveralls.yml b/.coveralls.yml
index 1bb89d8..3cedf69 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1 +1 @@
-repo_token: kpgz89M6PBaeNuamOJr9YaTmxDlRhVJQG
\ No newline at end of file
+repo_token: kpgz89M6PBaeNuamOJr9YaTmxDlRhVJQG
diff --git a/.gitignore b/.gitignore
index 6e0d35a..fdfb8bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ spec/testapp/db/*.sqlite3-journal
 spec/testapp/log/*.log
 spec/testapp/tmp/
 
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/.rspec b/.rspec
index 67e4680..83e16f8 100644
--- a/.rspec
+++ b/.rspec
@@ -1,2 +1,2 @@
 --color
---require spec_helper
\ No newline at end of file
+--require spec_helper
diff --git a/Gemfile b/Gemfile
index d926697..851fabc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
\ No newline at end of file
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index caa5c08..9f54d09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,12 +15,12 @@ PATH
       jquery-rails (~> 4.3, >= 4.3.1)
       jquery-ui-rails (~> 6.0, >= 6.0.1)
       multi_json (~> 1.12, >= 1.12.1)
-      oj (~> 2.18, >= 2.18.5)
-      paper_trail (~> 7.0, >= 7.0.1)
+      oj (~> 3.0, >= 3.0.2)
+      paper_trail (~> 7.0, >= 7.0.2)
       pg (~> 0.20.0)
-      phcadmin3 (~> 2.1, >= 2.1.2)
-      phcnotifi (~> 4.1, >= 4.1.2)
-      phctitleseo (~> 5.1, >= 5.1.2)
+      phcadmin3 (~> 2.1, >= 2.1.4)
+      phcnotifi (~> 4.1, >= 4.1.4)
+      phctitleseo (~> 5.1, >= 5.1.4)
       rabl (~> 0.13.1)
       rails (~> 5.0, >= 5.0.2)
       responders (~> 2.3)
@@ -125,8 +125,8 @@ GEM
     ffi (1.9.18)
     font-awesome-rails (4.7.0.1)
       railties (>= 3.2, < 5.1)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     gravtastic (3.2.6)
     houser (2.0.0)
       rack
@@ -147,7 +147,7 @@ GEM
       launchy (~> 2.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
@@ -155,50 +155,49 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    money (6.8.3)
+    money (6.9.0)
       i18n (>= 0.6.4, < 0.9)
-      sixarm_ruby_unaccent (>= 1.1.1, < 2)
     multi_json (1.12.1)
     netrc (0.11.0)
     nio4r (2.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    oj (2.18.5)
-    paper_trail (7.0.1)
+    oj (3.0.2)
+    paper_trail (7.0.2)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     pg (0.20.0)
-    phcadmin3 (2.1.2)
+    phcadmin3 (2.1.4)
       bootstrap-sass (~> 3.3, >= 3.3.7)
       country_select (~> 3.0)
       font-awesome-rails (~> 4.7, >= 4.7.0.1)
       gravtastic (~> 3.2, >= 3.2.6)
       jquery-rails (~> 4.3, >= 4.3.1)
       jquery-ui-rails (~> 6.0, >= 6.0.1)
-      paper_trail (~> 7.0, >= 7.0.1)
+      paper_trail (~> 7.0, >= 7.0.2)
       pg (~> 0.20.0)
       rails (~> 5.0, >= 5.0.2)
       sass-rails (~> 5.0, >= 5.0.6)
       tinymce-rails (~> 4.5, >= 4.5.6)
-    phcnotifi (4.1.2)
+    phcnotifi (4.1.4)
       bootstrap-sass (~> 3.3, >= 3.3.7)
       country_select (~> 3.0)
       font-awesome-rails (~> 4.7, >= 4.7.0.1)
       gravtastic (~> 3.2, >= 3.2.6)
       jquery-rails (~> 4.3, >= 4.3.1)
       jquery-ui-rails (~> 6.0, >= 6.0.1)
-      paper_trail (~> 7.0, >= 7.0.1)
+      paper_trail (~> 7.0, >= 7.0.2)
       pg (~> 0.20.0)
       rails (~> 5.0, >= 5.0.2)
       sass-rails (~> 5.0, >= 5.0.6)
-    phctitleseo (5.1.2)
+    phctitleseo (5.1.4)
       bootstrap-sass (~> 3.3, >= 3.3.7)
       country_select (~> 3.0)
       font-awesome-rails (~> 4.7, >= 4.7.0.1)
       gravtastic (~> 3.2, >= 3.2.6)
       jquery-rails (~> 4.3, >= 4.3.1)
       jquery-ui-rails (~> 6.0, >= 6.0.1)
-      paper_trail (~> 7.0, >= 7.0.1)
+      paper_trail (~> 7.0, >= 7.0.2)
       pg (~> 0.20.0)
       rails (~> 5.0, >= 5.0.2)
       sass-rails (~> 5.0, >= 5.0.6)
@@ -235,7 +234,7 @@ GEM
     request_store (1.3.2)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rest-client (2.0.1)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -295,7 +294,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.3)
+    unf_ext (0.0.7.4)
     unicode_utils (1.4.0)
     warden (1.2.7)
       rack (>= 1.0)
diff --git a/MIT-LICENSE b/MIT-LICENSE
index 91d175e..9afc748 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index e2d5bde..90ce9d9 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,15 @@
 [![Dependency Status](https://gemnasium.com/badges/github.com/PHCNetworks/multi-tenancy-warden.svg)](https://gemnasium.com/github.com/PHCNetworks/multi-tenancy-warden)
 [![Gem Version](https://badge.fury.io/rb/mtwarden.svg)](https://badge.fury.io/rb/mtwarden)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/PHCNetworks/multi-tenancy-warden/blob/master/MIT-LICENSE)
-  
+
 ### Mtwarden(MultiTenancyWarden) Documentation  
 PHC mtwarden gem adds a separate multi-tenant layer that handles all user registrations, multi-tenancy app functions, and login through subdomains using Warden authentication gem.  
-  
+
 #### Step 1 - Add Mtwarden to your gemfile and run command   
-  
+
 	gem 'mtwarden', '~> 3.6'
 	bundle exec install  
-  
+
 #### Step 2 - Add and migrate mtwarden database tables  
 
 	rake railties:install:migrations  
@@ -19,17 +19,17 @@ PHC mtwarden gem adds a separate multi-tenant layer that handles all user regist
 
 #### Step 3 - Mount the Engine in your Routes File  
 Add this line at the top of the routes.rb file.  
-  
+
 	require 'mtwarden/constraints/subdomain_required'  
 
 #### Step 4 - Mount the Engine in your Routes File  
 Add this line at the end of the routes.rb file.  
-  
+
 	mount Mtwarden::Engine, :at => '/'  
-  
+
 #### Step 5 - Constrain the routes you want secured in your routes.rb file.
 All the routes you want to have multi-tenancy login functions goes in between the constraints block.  
 
 	constraints(Mtwarden::Constraints::SubdomainRequired) do  
 		# Routes Requiring Security & Multi-Tenancy Routes    
-	end  
\ No newline at end of file
+	end  
diff --git a/Rakefile b/Rakefile
index 3e870c1..f08c218 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,4 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task default: :test
\ No newline at end of file
+task default: :test
diff --git a/app/assets/config/mtwarden_manifest.js b/app/assets/config/mtwarden_manifest.js
index 14ef9b9..b41a405 100644
--- a/app/assets/config/mtwarden_manifest.js
+++ b/app/assets/config/mtwarden_manifest.js
@@ -1,2 +1,2 @@
 //= link_directory ../javascripts/mtwarden .js
-//= link_directory ../stylesheets/mtwarden .scss
\ No newline at end of file
+//= link_directory ../stylesheets/mtwarden .scss
diff --git a/app/assets/javascripts/mtwarden/application.js b/app/assets/javascripts/mtwarden/application.js
index f15edee..d6f9f7c 100644
--- a/app/assets/javascripts/mtwarden/application.js
+++ b/app/assets/javascripts/mtwarden/application.js
@@ -1,2 +1,2 @@
 // Load PHCAdmin3 Javascript
-//= require phc_admins_main_three
\ No newline at end of file
+//= require phc_admins_main_three
diff --git a/app/assets/stylesheets/mtwarden/application.scss b/app/assets/stylesheets/mtwarden/application.scss
index d206ef9..f826b35 100644
--- a/app/assets/stylesheets/mtwarden/application.scss
+++ b/app/assets/stylesheets/mtwarden/application.scss
@@ -1,2 +1,2 @@
 // Load PHCAdmin3 Styles
-@import "phc_admins_style_three";
\ No newline at end of file
+@import "phc_admins_style_three";
diff --git a/app/controllers/mtwarden/account/accounts_controller.rb b/app/controllers/mtwarden/account/accounts_controller.rb
index c358b29..7533598 100644
--- a/app/controllers/mtwarden/account/accounts_controller.rb
+++ b/app/controllers/mtwarden/account/accounts_controller.rb
@@ -64,4 +64,4 @@ def account_params
 			params.require(:account).permit(:name, :plan_id)
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/account/dashboard_controller.rb b/app/controllers/mtwarden/account/dashboard_controller.rb
index 44fd69a..2140ac5 100644
--- a/app/controllers/mtwarden/account/dashboard_controller.rb
+++ b/app/controllers/mtwarden/account/dashboard_controller.rb
@@ -4,4 +4,4 @@ module Mtwarden
 	class Account::DashboardController < ApplicationController
 		before_filter :authenticate_user!
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/account/sessions_controller.rb b/app/controllers/mtwarden/account/sessions_controller.rb
index b5f8bf9..9090daa 100644
--- a/app/controllers/mtwarden/account/sessions_controller.rb
+++ b/app/controllers/mtwarden/account/sessions_controller.rb
@@ -17,4 +17,4 @@ def create
 			end
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/account/users_controller.rb b/app/controllers/mtwarden/account/users_controller.rb
index 28a3246..13645cf 100644
--- a/app/controllers/mtwarden/account/users_controller.rb
+++ b/app/controllers/mtwarden/account/users_controller.rb
@@ -20,4 +20,4 @@ def user_params
 			params.require(:user).permit(:email, :password, :password_confirmation)
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/accounts_controller.rb b/app/controllers/mtwarden/accounts_controller.rb
index e3b9839..da766b1 100644
--- a/app/controllers/mtwarden/accounts_controller.rb
+++ b/app/controllers/mtwarden/accounts_controller.rb
@@ -22,11 +22,11 @@ def create
 		private
 
 		def account_params
-			params.require(:account).permit(:name, :subdomain, 
+			params.require(:account).permit(:name, :subdomain,
 				{ :owner_attributes => [
 					[:email, :password, :password_confirmation]
 				]}
 			)
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/application_controller.rb b/app/controllers/mtwarden/application_controller.rb
index d5ab67c..2508f13 100644
--- a/app/controllers/mtwarden/application_controller.rb
+++ b/app/controllers/mtwarden/application_controller.rb
@@ -9,4 +9,4 @@ def authorize_owner
 		end
 	end
 
-end
\ No newline at end of file
+end
diff --git a/app/controllers/mtwarden/dashboard_controller.rb b/app/controllers/mtwarden/dashboard_controller.rb
index eb20c11..d098d45 100644
--- a/app/controllers/mtwarden/dashboard_controller.rb
+++ b/app/controllers/mtwarden/dashboard_controller.rb
@@ -3,4 +3,4 @@
 module Mtwarden
 	class DashboardController < ApplicationController
 	end
-end
\ No newline at end of file
+end
diff --git a/app/extenders/controllers/application_controller_extender.rb b/app/extenders/controllers/application_controller_extender.rb
index bc6a6bc..7bb1738 100644
--- a/app/extenders/controllers/application_controller_extender.rb
+++ b/app/extenders/controllers/application_controller_extender.rb
@@ -35,4 +35,4 @@ def owner?
 	end
 	helper_method :owner?
 
-end
\ No newline at end of file
+end
diff --git a/app/helpers/mtwarden/application_helper.rb b/app/helpers/mtwarden/application_helper.rb
index 820c332..0cf7cc8 100644
--- a/app/helpers/mtwarden/application_helper.rb
+++ b/app/helpers/mtwarden/application_helper.rb
@@ -1,4 +1,4 @@
 module Mtwarden
   module ApplicationHelper
   end
-end
\ No newline at end of file
+end
diff --git a/app/jobs/mtwarden/application_job.rb b/app/jobs/mtwarden/application_job.rb
index e951f22..ec7a266 100644
--- a/app/jobs/mtwarden/application_job.rb
+++ b/app/jobs/mtwarden/application_job.rb
@@ -1,4 +1,4 @@
 module Mtwarden
   class ApplicationJob < ActiveJob::Base
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/mtwarden/application_mailer.rb b/app/mailers/mtwarden/application_mailer.rb
index 130e896..b345b09 100644
--- a/app/mailers/mtwarden/application_mailer.rb
+++ b/app/mailers/mtwarden/application_mailer.rb
@@ -5,4 +5,4 @@ class ApplicationMailer < ActionMailer::Base
     layout 'mailer'
 
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/mtwarden/account.rb b/app/models/mtwarden/account.rb
index 6a43ba8..ca50a5e 100644
--- a/app/models/mtwarden/account.rb
+++ b/app/models/mtwarden/account.rb
@@ -13,11 +13,11 @@ class Account < ActiveRecord::Base
 		has_many :users, :through => :members
 
 		EXCLUDED_SUBDOMAINS = %w(admin)
-		validates_exclusion_of :subdomain, :in => EXCLUDED_SUBDOMAINS, 
+		validates_exclusion_of :subdomain, :in => EXCLUDED_SUBDOMAINS,
 		:message => "is not allowed. Please choose another subdomain."
 
 		validates_format_of :subdomain, :with => /\A[\w\-]+\Z/i,
-		:message => "is not allowed. Please choose another subdomain." 
+		:message => "is not allowed. Please choose another subdomain."
 
 		before_validation do
 			self.subdomain = subdomain.to_s.downcase
@@ -36,4 +36,4 @@ def owner?(user)
 		end
 	end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/mtwarden/application_record.rb b/app/models/mtwarden/application_record.rb
index 137ed0b..14e0ad2 100644
--- a/app/models/mtwarden/application_record.rb
+++ b/app/models/mtwarden/application_record.rb
@@ -2,4 +2,4 @@ module Mtwarden
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/mtwarden/member.rb b/app/models/mtwarden/member.rb
index b062b2a..bee12d8 100644
--- a/app/models/mtwarden/member.rb
+++ b/app/models/mtwarden/member.rb
@@ -3,4 +3,4 @@ class Member < ActiveRecord::Base
 		belongs_to :account, :class_name => "Mtwarden::Account"
 		belongs_to :user, :class_name => "Mtwarden::User"
 	end
-end
\ No newline at end of file
+end
diff --git a/app/models/mtwarden/plan.rb b/app/models/mtwarden/plan.rb
index 620d179..3950c84 100644
--- a/app/models/mtwarden/plan.rb
+++ b/app/models/mtwarden/plan.rb
@@ -1,4 +1,4 @@
 module Mtwarden
 	class Plan < ActiveRecord::Base
 	end
-end
\ No newline at end of file
+end
diff --git a/app/models/mtwarden/user.rb b/app/models/mtwarden/user.rb
index 0f54a75..84c1a65 100644
--- a/app/models/mtwarden/user.rb
+++ b/app/models/mtwarden/user.rb
@@ -4,4 +4,4 @@ class User < ActiveRecord::Base
 		gravtastic
 		has_secure_password
 	end
-end
\ No newline at end of file
+end
diff --git a/app/views/layouts/mtwarden/application.html.erb b/app/views/layouts/mtwarden/application.html.erb
index f00379f..d913faf 100644
--- a/app/views/layouts/mtwarden/application.html.erb
+++ b/app/views/layouts/mtwarden/application.html.erb
@@ -13,4 +13,4 @@
 		<%= render "mtwarden/shared/login" %>
 		<%= yield %>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/mtwarden/account/accounts/_existing_subscription.html.erb b/app/views/mtwarden/account/accounts/_existing_subscription.html.erb
index 7007aa5..060c998 100644
--- a/app/views/mtwarden/account/accounts/_existing_subscription.html.erb
+++ b/app/views/mtwarden/account/accounts/_existing_subscription.html.erb
@@ -1,3 +1,3 @@
 <%= form_tag confirm_plan_account_path(:plan_id => params[:plan_id]) do %>
 	<%= submit_tag "Change plan" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/account/accounts/_new_subscription.html.erb b/app/views/mtwarden/account/accounts/_new_subscription.html.erb
index 17d80ec..dd0d873 100644
--- a/app/views/mtwarden/account/accounts/_new_subscription.html.erb
+++ b/app/views/mtwarden/account/accounts/_new_subscription.html.erb
@@ -35,4 +35,4 @@
 		</p>
 		<%= customer.submit "Change plan" %>
 	<% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/account/accounts/edit.html.erb b/app/views/mtwarden/account/accounts/edit.html.erb
index eb5cabd..d2a21f2 100644
--- a/app/views/mtwarden/account/accounts/edit.html.erb
+++ b/app/views/mtwarden/account/accounts/edit.html.erb
@@ -14,4 +14,4 @@
 	</p>
 
 	<%= account.submit "Update Account" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/account/accounts/plan.html.erb b/app/views/mtwarden/account/accounts/plan.html.erb
index 6e87a02..b2e7c20 100644
--- a/app/views/mtwarden/account/accounts/plan.html.erb
+++ b/app/views/mtwarden/account/accounts/plan.html.erb
@@ -11,4 +11,4 @@
 	<%= render "existing_subscription" %>
 <% else %>
 	<%= render "new_subscription" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/account/dashboard/index.html.erb b/app/views/mtwarden/account/dashboard/index.html.erb
index 2b82c30..c2fd0e7 100644
--- a/app/views/mtwarden/account/dashboard/index.html.erb
+++ b/app/views/mtwarden/account/dashboard/index.html.erb
@@ -1 +1 @@
-Your account's dashboard. Coming soon.
\ No newline at end of file
+Your account's dashboard. Coming soon.
diff --git a/app/views/mtwarden/account/sessions/new.html.erb b/app/views/mtwarden/account/sessions/new.html.erb
index cf4d60f..61cb8d5 100644
--- a/app/views/mtwarden/account/sessions/new.html.erb
+++ b/app/views/mtwarden/account/sessions/new.html.erb
@@ -16,4 +16,4 @@
 	</p>
 <% end %>
 
-<%= link_to "New User?", user_sign_up_url %>
\ No newline at end of file
+<%= link_to "New User?", user_sign_up_url %>
diff --git a/app/views/mtwarden/account/users/_form.html.erb b/app/views/mtwarden/account/users/_form.html.erb
index e5de64a..8a14d99 100644
--- a/app/views/mtwarden/account/users/_form.html.erb
+++ b/app/views/mtwarden/account/users/_form.html.erb
@@ -11,4 +11,4 @@
 <p>
 	<%= user.label :password_confirmation %><br>
 	<%= user.password_field :password_confirmation %>
-</p>
\ No newline at end of file
+</p>
diff --git a/app/views/mtwarden/account/users/new.html.erb b/app/views/mtwarden/account/users/new.html.erb
index 65a1ebc..c7c5bc1 100644
--- a/app/views/mtwarden/account/users/new.html.erb
+++ b/app/views/mtwarden/account/users/new.html.erb
@@ -3,4 +3,4 @@
 <%= form_for(@user, :url => do_user_sign_up_url) do |user| %>
 	<%= render "mtwarden/account/users/form", :user => user %>
 	<%= user.submit "Sign up" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/accounts/new.html.erb b/app/views/mtwarden/accounts/new.html.erb
index 8ae4779..b868969 100644
--- a/app/views/mtwarden/accounts/new.html.erb
+++ b/app/views/mtwarden/accounts/new.html.erb
@@ -17,4 +17,4 @@
 	<% end %>
 
 	<%= account.submit %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/mtwarden/dashboard/index.html.erb b/app/views/mtwarden/dashboard/index.html.erb
index 668013c..a06ae9c 100644
--- a/app/views/mtwarden/dashboard/index.html.erb
+++ b/app/views/mtwarden/dashboard/index.html.erb
@@ -1 +1 @@
-<%= link_to "Account Sign Up", sign_up_path %>
\ No newline at end of file
+<%= link_to "Account Sign Up", sign_up_path %>
diff --git a/app/views/mtwarden/shared/_login.html.erb b/app/views/mtwarden/shared/_login.html.erb
index 832f36b..9186ac5 100644
--- a/app/views/mtwarden/shared/_login.html.erb
+++ b/app/views/mtwarden/shared/_login.html.erb
@@ -1,7 +1,7 @@
 <% if user_signed_in? %>
-	Signed in as <%= current_user.email %> 
+	Signed in as <%= current_user.email %>
 	<% if owner? %>
 		&middot;
 		<%= link_to "Edit Account", account_path %>
 	<% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/bin/rails b/bin/rails
index 25d14ea..9043a0d 100644
--- a/bin/rails
+++ b/bin/rails
@@ -8,4 +8,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 require 'rails/all'
-require 'rails/engine/commands'
\ No newline at end of file
+require 'rails/engine/commands'
diff --git a/config/initializers/warden/strategies/password.rb b/config/initializers/warden/strategies/password.rb
index 8aaa30d..5b36ad2 100644
--- a/config/initializers/warden/strategies/password.rb
+++ b/config/initializers/warden/strategies/password.rb
@@ -3,11 +3,11 @@
   def subdomain
     ActionDispatch::Http::URL.extract_subdomains(request.host, 1)
   end
-  
+
   def valid?
     subdomain.present? && params["user"]
   end
-  
+
   def authenticate!
     return fail! unless account = Mtwarden::Account.find_by(subdomain: subdomain)
     return fail! unless user = account.users.find_by(email: params["user"]["email"])
@@ -15,4 +15,4 @@ def authenticate!
     success! user
   end
 
-end
\ No newline at end of file
+end
diff --git a/config/routes.rb b/config/routes.rb
index b3737bc..4fd95df 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,9 +22,9 @@
       :as => :confirm_plan_account
     end
   end
-  
+
   root "dashboard#index"
   get "/sign_up", :to => "accounts#new", :as => :sign_up
   post "/accounts", :to => "accounts#create", :as => :accounts
 
-end
\ No newline at end of file
+end
diff --git a/coverage/.last_run.json b/coverage/.last_run.json
index 8540cc5..8b0277d 100644
--- a/coverage/.last_run.json
+++ b/coverage/.last_run.json
@@ -2,4 +2,4 @@
   "result": {
     "covered_percent": 66.8
   }
-}
\ No newline at end of file
+}
diff --git a/db/migrate/20140621030847_create_mtwarden_accounts.rb b/db/migrate/20140621030847_create_mtwarden_accounts.rb
index 2e56194..5ce7e71 100644
--- a/db/migrate/20140621030847_create_mtwarden_accounts.rb
+++ b/db/migrate/20140621030847_create_mtwarden_accounts.rb
@@ -3,9 +3,9 @@ def change
     create_table :mtwarden_accounts do |t|
 
       t.string :name
-      
+
       t.timestamps
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb b/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb
index 0307370..9e6aa73 100644
--- a/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb
+++ b/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb
@@ -4,4 +4,4 @@ def change
     add_column :mtwarden_accounts, :owner_id, :integer
 
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140621114231_create_mtwarden_users.rb b/db/migrate/20140621114231_create_mtwarden_users.rb
index 59c62b6..8a44fe8 100644
--- a/db/migrate/20140621114231_create_mtwarden_users.rb
+++ b/db/migrate/20140621114231_create_mtwarden_users.rb
@@ -4,9 +4,9 @@ def change
 
         t.string :email
         t.string :password_digest
-        
+
         t.timestamps
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140621114308_create_mtwarden_members.rb b/db/migrate/20140621114308_create_mtwarden_members.rb
index b268d8f..684d9ef 100644
--- a/db/migrate/20140621114308_create_mtwarden_members.rb
+++ b/db/migrate/20140621114308_create_mtwarden_members.rb
@@ -4,9 +4,9 @@ def change
 
       t.integer :account_id
       t.integer :user_id
-      
+
       t.timestamps
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb b/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb
index 99b33df..c430f56 100644
--- a/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb
+++ b/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb
@@ -5,4 +5,4 @@ def change
     add_index :mtwarden_accounts, :subdomain
 
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140829231923_create_mtwarden_plans.rb b/db/migrate/20140829231923_create_mtwarden_plans.rb
index a6528ed..3d13ff7 100644
--- a/db/migrate/20140829231923_create_mtwarden_plans.rb
+++ b/db/migrate/20140829231923_create_mtwarden_plans.rb
@@ -5,9 +5,9 @@ def change
       t.string :name
       t.float :price
       t.string :braintree_id
-      
+
       t.timestamps
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb b/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb
index 19b64b9..6ec44dd 100644
--- a/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb
+++ b/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb
@@ -4,4 +4,4 @@ def change
     add_column :mtwarden_accounts, :plan_id, :integer
 
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb b/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb
index 43debe8..c7b6a6a 100644
--- a/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb
+++ b/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb
@@ -4,4 +4,4 @@ def change
     add_column :mtwarden_accounts, :braintree_subscription_id, :string
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/mtwarden/version.rb b/lib/mtwarden/version.rb
index b817f14..991838d 100644
--- a/lib/mtwarden/version.rb
+++ b/lib/mtwarden/version.rb
@@ -1,3 +1,3 @@
 module Mtwarden
-  VERSION = '4.1.2'
-end
\ No newline at end of file
+  VERSION = '4.1.3'
+end
diff --git a/mtwarden.gemspec b/mtwarden.gemspec
index f213244..fbcb36f 100644
--- a/mtwarden.gemspec
+++ b/mtwarden.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   # Main Dependencies
   spec.add_dependency 'rails', '~> 5.0', '>= 5.0.2'
   spec.add_dependency 'pg', '~> 0.20.0'
-  spec.add_dependency 'paper_trail', '~> 7.0', '>= 7.0.1'
+  spec.add_dependency 'paper_trail', '~> 7.0', '>= 7.0.2'
 
   # UI & Frontend Dependencies
   spec.add_dependency 'jquery-rails', '~> 4.3', '>= 4.3.1'
@@ -36,12 +36,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tinymce-rails', '~> 4.5', '>= 4.5.6'
 
   # PHCEngines & Theme Dependencies
-  spec.add_dependency 'phcadmin3', '~> 2.1', '>= 2.1.2'
-  spec.add_dependency 'phctitleseo', '~> 5.1', '>= 5.1.2'
-  spec.add_dependency 'phcnotifi', '~> 4.1', '>= 4.1.2'
+  spec.add_dependency 'phcadmin3', '~> 2.1', '>= 2.1.4'
+  spec.add_dependency 'phctitleseo', '~> 5.1', '>= 5.1.4'
+  spec.add_dependency 'phcnotifi', '~> 4.1', '>= 4.1.4'
 
   # API Dependencies
-  spec.add_dependency 'oj', '~> 2.18', '>= 2.18.5'
+  spec.add_dependency 'oj', '~> 3.0', '>= 3.0.2'
   spec.add_dependency 'rabl', '~> 0.13.1'
   spec.add_dependency 'multi_json', '~> 1.12', '>= 1.12.1'
   spec.add_dependency 'responders', '~> 2.3'
@@ -76,4 +76,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1', '>= 3.1.1'
   spec.add_development_dependency 'letter_opener', '~> 1.4', '>= 1.4.1'
 
-end
\ No newline at end of file
+end