James can't spell
Merge branch 'and_some_more' of github.com:jspc/jeff-stelling into and_some_more