chore(demo): update demo page for bootstrap3

Squashed #1331, rebased to latest, and added a few tweaks.  Should be good to merge.