Updates!

Weekend!

Signed-off-by: Bowe Frankema <bowe@cfcommunity.net>
Merge branch 'master' of https://github.com/CFCommunity-net/cfcommunity
Fix some broken stuff

Signed-off-by: Bowe Frankema <bowe@cfcommunity.net>