Misc minor stuff
Merge branch 'development' of https://github.com/NickGeek/campfyre into development