Merge pull request #497 from caseyjhol/master

v1.5.1 (fix #495)
"Twitter Bootstrap" is now simply Bootstrap

See http://getbootstrap.com/about/#brand
Merge pull request #505 from cvrebert/bootstrap-org-change

"Twitter Bootstrap" is now simply Bootstrap
Fix #466, fix #475, fix #470

Fixes issues with hidden options and using the data-container with
keyboard
v1.5.2