Update Jade, add some bootstrap elements back in
Merge branch 'gh-pages' of https://github.com/byuweb/byu-responsive-dev into gh-pages

Conflicts:
	css/base.css
	css/responsive.css