Merge branch 'release/brunch-toolchain-0.4.0'
Merge branch 'develop'
Remove extra from package.json