hotfix test errors
Merge branch 'master' of http://github.com/edenjs/time