$options can now be used in bootstrap
Merge branch 'bootstrap_inclusion_scope'