Adjust config parsing to handle config.xml changes

Closes #20