Adjustments for changes in the latest eve-core
Merge branch 'master' of github.com:almende/eve