A few updates
Merge branch 'master' of github.com:nmalcolm/mybb-development-server