Combine Bootstrap CSS with Base

- Replace Bootstrap copying with a concat with base SCSS
- Trim trailing commas
- Updated templates for new single base CSS