fix tests
Merge branch 'master' of github.com:classdojo/paperclip.js