Merge pull request #159 from cjsaylor/2.2.1

Updated markup to work with BS3 RC2 changes.
Merge branch 'master' into 2.3