Combine Bootstrap CSS with Base

- Replace Boostrap copying with a concat with base SCSS
- Trim trailing commas
- Updated templates for new single base CSS
Merge pull request #3378 from nschonni/v4-combine-css

Combine Bootstrap CSS with Base