incorporated in Jonas's changes

added some nanokontrol stuff
Merge branch 'master' of https://github.com/BiLEnsemble/BiLETools