Merge webpack branch

No more `browserify`! Woo!