Use testem as test runner
Merge branch 'master' into gh-pages
Change tests to point to travis