Upgrade to bootstrap 3+, added mixin pattern, fixed a few bugs