WIP: Make bourbon a dependency to clean up output
Removing a dead file
Tweak the default templates
Merge branch 'bourbon'