Ignoring my local config and settings
Merge branch 'master' of https://github.com/BrianOtto/mybb