Begin transition to Bootstrap3
Merge branch 'refs/heads/jekyll2bootstrap'

* refs/heads/jekyll2bootstrap:
  Begin transition to Bootstrap3