diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index af7ec95a..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# All text files should have LF regardless of core.autocrlf
-* text eol=lf
diff --git a/package.json b/package.json
index 6fc4661f..6ef5b1f9 100644
--- a/package.json
+++ b/package.json
@@ -19,15 +19,16 @@
   "scripts": {
     "install": "cd src && npm install",
     "postinstall": "npm run build",
-    "build": "npm run build:main && npm run build:renderer && gulp build",
+    "build": "npm-run-all build:*",
     "build:main": "cross-env NODE_ENV=production webpack --config webpack.config.main.js",
     "build:renderer": "cross-env NODE_ENV=production webpack --config webpack.config.renderer.js",
+    "build:others": "gulp build",
     "start": "electron dist",
     "watch": "gulp watch",
     "serve": "gulp watch",
-    "test": "npm run build && npm run test:app && npm run lint:js",
+    "test": "npm-run-all build test:* lint:*",
     "test:app": "mocha --reporter mocha-circleci-reporter --recursive test/specs",
-    "package:all": "npm run package:windows && npm run package:mac && npm run package:linux",
+    "package:all": "npm-run-all package:windows package:mac package:linux",
     "package:windows": "build --win --x64 --ia32 --em.name=mattermost && npm run manipulate-windows-zip",
     "package:mac": "build --mac --x64 --ia32",
     "package:linux": "build --linux --x64 --ia32 --em.name=mattermost-desktop",
@@ -55,6 +56,7 @@
     "json-loader": "^0.5.4",
     "mocha": "^3.2.0",
     "mocha-circleci-reporter": "0.0.2",
+    "npm-run-all": "^3.1.2",
     "spectron": "~3.4.1",
     "webpack": "^1.14.0",
     "webpack-merge": "^1.1.2"