Renaming settings sections
Merge branch 'master' of https://github.com/aristath/shoestrap into jombotron_bottom_border