merge hamish changes in for spam protection
Merge branch 'master' of github.com:unclecheese/silverstripe-forum