diff --git a/app/assets/stylesheets/cmtool/application.css b/app/assets/stylesheets/cmtool/application.css
index a4d07a3..41310ee 100644
--- a/app/assets/stylesheets/cmtool/application.css
+++ b/app/assets/stylesheets/cmtool/application.css
@@ -9,6 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require 'bootstrap-devise-rails'
+ * require 'bootstrap-devise-rails'
  *= require_directory .
 */
diff --git a/lib/cmtool/engine.rb b/lib/cmtool/engine.rb
index f5240fe..c5236ff 100644
--- a/lib/cmtool/engine.rb
+++ b/lib/cmtool/engine.rb
@@ -17,6 +17,7 @@ module Cmtool
     initializer "cmtool" do
     end
     ActiveSupport.on_load(:action_view) do
+      require '../app/helpers/cmtool/application_helper'
       ::ActionView::Base.send :include, Cmtool::ApplicationHelper
     end
   end
diff --git a/vendor/assets/devise/bootstrap-devise-rails.css.less b/vendor/assets/devise/bootstrap-devise-rails.css.less
deleted file mode 100644
index 8e8935b..0000000
--- a/vendor/assets/devise/bootstrap-devise-rails.css.less
+++ /dev/null
@@ -1,51 +0,0 @@
-// require 'twitter/bootstrap/bootstrap'
-@import "twitter/bootstrap/variables";
-@import "twitter/bootstrap/mixins";
-@import "twitter/bootstrap/alerts";
-@import "twitter/bootstrap/buttons";
-@import "twitter/bootstrap/forms";
-.devise {
-  br { display:none; }
-  // Copied from forms.less's legend
-  > h2, > h3 {
-    display: block;
-    width: 100%;
-    padding: 0;
-    margin-bottom: @baseLineHeight * 1.5;
-    font-size: @baseFontSize * 1.5;
-    line-height: @baseLineHeight * 2;
-    color: @grayDark;
-    border: 0;
-    border-bottom: 1px solid #eee;
-  }
-  > h2, >h3 {
-    margin-bottom: @baseLineHeight;
-  }
-  form {
-    // Base form styles
-    margin:0;
-    label[for=user_remember_me] { display: inline; }
-    input[type=submit] {
-      .btn-primary;
-      .btn-large;
-      margin:6px 0;
-    }
-    i { display: block; }
-    // Errors
-    #error_explanation {
-      h2 {
-        line-height: @baseLineHeight;
-        font-size: 14px;
-        .alert-error;
-      }
-      ul { margin-bottom: 0; }
-      .alert;
-      .alert-error;
-    }
-    .field_with_errors {
-      .control-group .error;
-    }
-  }
-  a:last-of-type:after { content: ''; }
-  a:after { content: '\0020\007c'; }
-}