Updated for EDAM_1.7

Updated from the hackthon and bug fixes
Merge branch 'master' of https://github.com/edamontology/edamontology