WIP #757 Buddy System Enhancements

settings.php should be empty :D