Merged conflicts with upstream and added JSHint and Uglify tasks