Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
Merge branch 'master' of github.com:twbs/bootstrap