Added lxml to requirements
Merge branch 'master' into develop
Merge branch 'develop' of github.com:mhoffman/kmos into develop