first commit from me, merging a stray swap config.xml~
fix minor typo in comment