Fix code blocks so the don't end up wrapping references.
Merge remote-tracking branch 'upstream/master' into literal_markup

* upstream/master:
  Add todo notes.
  style

Conflicts:
	sphinx_bootstrap_theme/bootstrap/static/bootstrap-sphinx.js
Updated indentation to match the rest of the project.
Merge pull request #21 from russell/literal_markup

Literal markup