upgrade to latest bootstrap
minor bootstrap restructure
Merge pull request #1 from sarahgp/upgrade-bootstrap

Upgrade bootstrap