Use XMLString instead of XMLFile to avoid deprecated passing of file objects into the latter.
Clean up some pep8 whitespace violations.
Merge branch 'feature/issue-29-cleanup' into develop
Merge branch 'develop' of github.com:praekelt/diamondash into develop