port back to using bootstrap-sass
fixed merge conflict