added FIXMEs
changed the test class to make it work on the jenkins
pulled some changes made through the github web site

Merge branch 'develop' of https://github.com/NLeSC/enram into develop