merged feature/discretemapper
Merge branch 'develop' of github.com:idekerlab/KEGGscape into develop