Made config parser a littler nicer. #1 is mostly done now.