Merge pull request #794 from mottiok/master

expose more default values from blacklight_config
removed unnecessary Bootstrap 2 class
Merge pull request #797 from mejackreed/remove-bootstrap-class

removed unnecessary Bootstrap 2 class
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/mottiok/blacklight