Lock in testem to 0.6.21 to fix strange npm issue
Merge branch 'hotfix/0.9.1'