refixing karma watch task so tests are readable
Merge branch 'master' into no-column-landing