Merge pull request #2594 from ssplatt/npm-scripts

add special setup stages to package.json

package.json

@@ -9,7 +9,9 @@
   },
   "scripts": {
     "start": "node platform minMemo noBrowser",
+    "presetup": "git checkout develop && git pull upstream develop",
     "setup": "node setup noShortcuts",
+    "postsetup": "npm start",
     "dist": "electron-builder -c build/electron-builder.json",
     "postinstall": "electron-builder install-app-deps"
   },