Updated stuff in a rush before work
Merge branch 'dev' of github.com:adamcbrewer/brewerlogic.com into dev

Forgot to push before work. Now I have to merge. Sigh.