simplify waveform logic and tests

Oh also if you name a template 'templatename.directive.html.jade' it will avoid the automatic template complication tests for that file - useful if you're testing the directive yourself.