More upstream updates and glyphicons moved
Missed some upstream changes
Removed some unused conversions
Removed twbs- prefix from mixin names