small output changes
Merge branch 'mcedp_integration' of github.com:jamu/cuckoo into mcedp_integration