More Boostrap 2 -> 3 upgrades.
Fixes #528, #508
Merge pull request #533 from projecthydra/bootstrap_more

More Boostrap 2 -> 3 upgrades.