Use scrunch instead of browserify, and remove handlebars and modernizr
Merge changes