bump to version 2.2.0 and change some things

Author: mikeseese

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "node",
+            "request": "launch",
+            "program": "",
+            "stopOnEntry": false,
+            "args": [],
+            "cwd": "${workspaceRoot}/packages/client-app/",
+            "runtimeExecutable": "${workspaceRoot}/packages/client-app/node_modules/.bin/electron",
+            "runtimeArgs": [
+                "${workspaceRoot}/packages/client-app/src/browser/main.js",
+                "--enable-logging",
+                "--dev"
+            ],
+            "env": {},
+            "sourceMaps": true
+        },
+        {
+            "name": "Attach",
+            "type": "node",
+            "request": "attach",
+            "port": 5858,
+            "sourceMaps": true
+        }
+    ]
+}

package.json

@@ -65,7 +65,7 @@
     "url": "git+https://github.com/nylas/nylas-mail-all.git"
   },
   "author": "Nylas",
-  "license": "proprietary",
+  "license": "MIT",
   "engines": {
     "node": "6.9.1",
     "npm": "3.10.8"

packages/client-app/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Nylas Mail Changelog
 
+### 2.2.0 (9/14/2017)
+
+  + Merge complete code dump from Nylas with 2.1.0 (Issue #69)
+
 ### 2.1.0 (7/9/2017)
 
   + An NML (Nylas Mail Lives) Build

packages/client-app/package.json

@@ -1,9 +1,9 @@
 {
   "name": "nylas-mail",
   "productName": "Nylas Mail",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "The best email app for people and teams at work",
-  "license": "GPL-3.0",
+  "license": "MIT",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",