diff --git a/scripts/aloha-local.coffee b/scripts/aloha-local.coffee
index 864eac70..5ece911f 100644
--- a/scripts/aloha-local.coffee
+++ b/scripts/aloha-local.coffee
@@ -1,2 +1,6 @@
-define ['cs!configs/aloha'], (AlohaConfig) ->
+define ['jquery', 'cs!configs/aloha'], ($, AlohaConfig) ->
+  $.browser = {}
+  $.browser.msie = false
+  $.fn.live = $.fn.on # (events, data, handler) -> @on(events, data, handler)
+
   AlohaConfig.settings.bundles.ghbook = '../../../bookish/scripts/aloha'
diff --git a/scripts/config.coffee b/scripts/config.coffee
index b8aba903..2a74a106 100644
--- a/scripts/config.coffee
+++ b/scripts/config.coffee
@@ -47,7 +47,7 @@ require.config
     hbs: "#{BOWER}/require-handlebars-plugin/hbs"
 
     # ## Core Libraries
-    jquery: "#{BOWER}/jquery/jquery"
+    jquery: "#{BOWER}/jquery/dist/jquery"
     underscore: "#{BOWER}/lodash/lodash"
     backbone: "#{BOWER}/backbone/backbone"
     # Layout manager for backbone
@@ -60,19 +60,19 @@ require.config
     select2: "#{BOWER}/select2/select2"
     moment: "#{BOWER}/moment/moment"
     # Bootstrap Plugins
-    bootstrapAffix: "#{BOWER}/bootstrap/js/bootstrap-affix"
-    bootstrapAlert: "#{BOWER}/bootstrap/js/bootstrap-alert"
-    bootstrapButton: "#{BOWER}/bootstrap/js/bootstrap-button"
-    bootstrapCarousel: "#{BOWER}/bootstrap/js/bootstrap-carousel"
-    bootstrapCollapse: "#{BOWER}/bootstrap/js/bootstrap-collapse"
-    bootstrapDropdown: "#{BOWER}/bootstrap/js/bootstrap-dropdown"
-    bootstrapModal: "#{BOWER}/bootstrap/js/bootstrap-modal"
-    bootstrapPopover: "#{BOWER}/bootstrap/js/bootstrap-popover"
-    bootstrapScrollspy: "#{BOWER}/bootstrap/js/bootstrap-scrollspy"
-    bootstrapTab: "#{BOWER}/bootstrap/js/bootstrap-tab"
-    bootstrapTooltip: "#{BOWER}/bootstrap/js/bootstrap-tooltip"
-    bootstrapTransition: "#{BOWER}/bootstrap/js/bootstrap-transition"
-    bootstrapTypeahead: "#{BOWER}/bootstrap/js/bootstrap-typeahead"
+    bootstrapAffix: "#{BOWER}/bootstrap/js/affix"
+    bootstrapAlert: "#{BOWER}/bootstrap/js/alert"
+    bootstrapButton: "#{BOWER}/bootstrap/js/button"
+    bootstrapCarousel: "#{BOWER}/bootstrap/js/carousel"
+    bootstrapCollapse: "#{BOWER}/bootstrap/js/collapse"
+    bootstrapDropdown: "#{BOWER}/bootstrap/js/dropdown"
+    bootstrapModal: "#{BOWER}/bootstrap/js/modal"
+    bootstrapPopover: "#{BOWER}/bootstrap/js/popover"
+    bootstrapScrollspy: "#{BOWER}/bootstrap/js/scrollspy"
+    bootstrapTab: "#{BOWER}/bootstrap/js/tab"
+    bootstrapTooltip: "#{BOWER}/bootstrap/js/tooltip"
+    bootstrapTransition: "#{BOWER}/bootstrap/js/transition"
+    bootstrapTypeahead: "#{BOWER}/bootstrap/js/typeahead"
     bootstrapTags: "#{BOWER}/bootstrapTags/dist/bootstrap-tagsinput.min"
     bootstrapTagsCss: "#{BOWER}/bootstrapTags/dist/bootstrap-tagsinput"
 
@@ -146,7 +146,6 @@ require.config
         "css!#{BOWER}/aloha-editor/src/css/aloha.css"]
       exports: 'Aloha'
       init: () ->
-        jQuery.browser.version = 10000 # Hack to fix aloha-editor's version checking
         require(['less!styles/gh-book/aloha-override.less']) # make sure this comes in after the aloha.css
         if MINIFIED_ALOHA
           Aloha.require ["css!aloha.css"]
diff --git a/scripts/gh-book/auth-template.html b/scripts/gh-book/auth-template.html
index f54be2cd..4685913f 100644
--- a/scripts/gh-book/auth-template.html
+++ b/scripts/gh-book/auth-template.html
@@ -30,7 +30,7 @@
     </a>
     <ul class="dropdown-menu pull-right">
       {{#if isAuthenticated}}
-        <li><a href="" id="sign-out">Sign Out of "{{id}}"</a></li> 
+        <li><a href="" id="sign-out">Sign Out of "{{id}}"</a></li>
       {{else}}
         <li><a href="" id="sign-in">Sign In</a></li>
       {{/if}}
@@ -41,10 +41,12 @@
 </div>
 
 <!-- Sign in Modal -->
-<div id="sign-in-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="sign-in-modal-label" aria-hidden="true">
+<div id="sign-in-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sign-in-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="sign-in-modal-label">Sign in to Book Editor</h3>
+    <h3 id="sign-in-modal-label" class="modal-title">Sign in to Book Editor</h3>
   </div>
   <form class="modal-form" action="#" id="login-form">
   <div class="modal-body">
@@ -73,14 +75,18 @@ <h3 id="sign-in-modal-label">Sign in to Book Editor</h3>
     <button id="sign-in-ok" type="submit" class="btn btn-primary">Sign In</button>
   </div>
   </form>
+  </div>
+  </div>
 </div>
 
 
 <!-- Fork Book Modal -->
-<div id="fork-book-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-book-modal-label" aria-hidden="true">
+<div id="fork-book-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="fork-book-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="fork-book-modal-label">Copy this shelf!</h3>
+    <h3 id="fork-book-modal-label" class="modal-title">Copy this shelf!</h3>
   </div>
   <h4>&#160; Places I have permission to make changes:</h4>
   <div class="modal-body">
@@ -91,12 +97,16 @@ <h4>&#160; Places I have permission to make changes:</h4>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
   </div>
+  </div>
+  </div>
 </div>
 
-<div id="fork-progress-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-progress-modal-label" aria-hidden="true">
+<div id="fork-progress-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="fork-progress-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="fork-progress-modal-label">Copying in progress</h3>
+    <h3 id="fork-progress-modal-label" class="modal-title">Copying in progress</h3>
   </div>
   <div class="modal-body">
     [Progress indicator here]
@@ -104,12 +114,16 @@ <h3 id="fork-progress-modal-label">Copying in progress</h3>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
   </div>
+  </div>
+  </div>
 </div>
 
-<div id="fork-redirect-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-redirect-modal-label" aria-hidden="true">
+<div id="fork-redirect-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="fork-redirect-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="fork-redirect-modal-label">Existing bookshelf</h3>
+    <h3 id="fork-redirect-modal-label" class="modal-title">Existing bookshelf</h3>
   </div>
   <div class="modal-body">
     You already have a copy of this bookshelf.
@@ -118,14 +132,18 @@ <h3 id="fork-redirect-modal-label">Existing bookshelf</h3>
     <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
     <button class="btn btn-primary">Take me there</button>
   </div>
+  </div>
+  </div>
 </div>
 
 
 <!-- Edit Repository Modal -->
-<div id="edit-repo-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="edit-repo-modal-label" aria-hidden="true">
+<div id="edit-repo-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-repo-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="edit-repo-modal-label">Change Bookshelf</h3>
+    <h3 id="edit-repo-modal-label" class="modal-title">Change Bookshelf</h3>
   </div>
   <div class="modal-body">
     <div class="pull-right">
@@ -139,7 +157,7 @@ <h3 id="edit-repo-modal-label">Change Bookshelf</h3>
       <p>
         <a href="" data-select-repo='{"repoUser":"{{defaultRepo.repoUser}}","repoName":"{{defaultRepo.repoName}}"}'>
           Start with the demo bookshelf
-        </a> 
+        </a>
         ({{defaultRepo.repoUser}} / {{defaultRepo.repoName}})
       </p>
     {{/unless}}
@@ -179,14 +197,18 @@ <h5>View or create another shelf:</h5>
   </div>
   <div class="modal-footer">
   </div>
+  </div>
+  </div>
 </div>
 
 
 <!-- Diffs Modal -->
-<div id="diffs-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="diffs-modal-label" aria-hidden="true">
+<div id="diffs-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="diffs-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="diffs-modal-label">Unsaved Changes</h3>
+    <h3 id="diffs-modal-label" class="modal-title">Unsaved Changes</h3>
   </div>
   <div class="modal-body" style="font-size: x-small;">
   </div>
@@ -194,4 +216,6 @@ <h3 id="diffs-modal-label">Unsaved Changes</h3>
     <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
   </div>
 </div>
+</div>
+</div>
 
diff --git a/scripts/gh-book/welcome-sign-in-template.html b/scripts/gh-book/welcome-sign-in-template.html
index 83a52104..7a07408d 100644
--- a/scripts/gh-book/welcome-sign-in-template.html
+++ b/scripts/gh-book/welcome-sign-in-template.html
@@ -1,7 +1,9 @@
 <!-- Sign in Modal -->
-<div id="sign-in-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="sign-in-modal-label" aria-hidden="true">
+<div id="sign-in-modal" data-backdrop="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sign-in-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <div class="modal-content">
   <div class="modal-header">
-    <h3 id="sign-in-modal-label">Sign in to Github!</h3>
+    <h3 id="sign-in-modal-label" class="modal-title">Sign in to Github!</h3>
   </div>
   <div class="modal-body">
     <p>To edit a book you must provide a username and password or an OAuth token.</p>
@@ -20,4 +22,6 @@ <h3 id="sign-in-modal-label">Sign in to Github!</h3>
   <div class="modal-footer">
     <button id="sign-in-ok" type="submit" class="btn btn-primary">Sign In</button>
   </div>
+  </div>
+  </div>
 </div>