patch to deal elegantly with an insufficient argument count
Merge branch 'feature/karma' into develop

Bring in a less buggy karma suite
move the core commands out into their own file