Reduce bower imports to min

While we work on the style - don't import things we don't actually want
right now.
Further bower fixups
Bower merge cleanup