fix bootstrap override includes by moving it to a scss file
move from pills to tabs
Merge branch 'bump-to-bootstrap-3.3.1'