Added env loader for eeepc, add config test files, fix merge conflict in settings.gradle