Updated to make the AngularJS work with Bootstrap and its javascript (as in, removed bootstrap's javascript :) ).  Essentially took changes I made in the UI branch and updated them here.