Merge branch 'master' into drumlore

* master: (75 commits)
  Small updates
  Facilitating easier branching
  Working with new colour system
  Neater blockquotes and code blocks
  Views bug fix
  Further streamlining of views module
  Total overhaul of the views module, version bump
  Small fix to archives
  Small fix to archives
  Removing extraneous stylesheets
  Minor fixes and clean-up
  Clean-up
  Simplifying colour scheming, Prism compatibility
  Comments, contact form, and navigation tune-ups
  Page loader loading and some small fixes
  Updating docs
  Smashing all the contact form bugs
  Improved AJAX contact form
  Making sense of navigation
  Page navigation
  ...

Conflicts:
	assets/src/js/lib/prism.js
	assets/src/js/plugins/prism.js
	pendrell/functions-config.php
	pendrell/pendrell-plugins.min.js
	pendrell/style.css
	src/header.php
	src/js/prism.js
	src/scss/_general.scss
	src/scss/_menu.scss
	src/scss/style.scss