Update Dev Dependencies
Rebuild
Merge branch 'master' into browserify