Changed config.inc.php to include config.inc.local.php and config.default.php so config.inc.local.php will never be overwritten by an update
Made LimeSurvey configuration rely on queXS configuration so it does not need to be configured twice