Feature/bootstrap3

Mostly a speculative pull request, has not been tested extensively.

Thoughts?