XML refactoring.
Merge branch 'master' of github.com:jacksleight/coast