tweaks to built-in bootstrap to make it less greedy
Merge branch 'master' of github.com:concrete5/concrete5