Back out email change that shouldn't have been merged with the SASS branch, rearrange where bootstrap code is imported
Add missing change to move Bootstrap include into the bootstrap3 SCSS