Merge remote-tracking branch 'lewis/master'

Updates for paper.
Small cleanups.
Typo fix.
Another small fix.
Merge pull request #1 from mcmtroffaes/master

Small cleanups.