Bunch of changes I forgot to commit, not gonna figure it out now\! You probably aren't reading this anyway.
Merge branch 'master' of https://github.com/petitJAM/zebes-status-server