Revert merge changes

Author: virkt25

test/mocha.opts

@@ -1,3 +1,2 @@
 --recursive
 --reporter dot
-dist/test

tslint.full.json

@@ -1,21 +1,17 @@
 {
-    "$schema": "http://json.schemastore.org/tslint",
-    "extends": [
-      "./tslint.json"
-    ],
-    // This configuration files enabled rules which require type checking
-    // and therefore cannot be run by Visual Studio Code TSLint extension
-    // See https://github.com/Microsoft/vscode-tslint/issues/70
-    "rules": {
-      // These rules find errors related to TypeScript features.
-  
-  
-      // These rules catch common errors in JS programming or otherwise
-      // confusing constructs that are prone to producing bugs.
-  
-      "await-promise": true,
-      "no-floating-promises": true,
-      "no-void-expression": [true, "ignore-arrow-function-shorthand"]
-    }
+  "$schema": "http://json.schemastore.org/tslint",
+  "extends": ["./tslint.json"],
+  // This configuration files enabled rules which require type checking
+  // and therefore cannot be run by Visual Studio Code TSLint extension
+  // See https://github.com/Microsoft/vscode-tslint/issues/70
+  "rules": {
+    // These rules find errors related to TypeScript features.
+
+    // These rules catch common errors in JS programming or otherwise
+    // confusing constructs that are prone to producing bugs.
+
+    "await-promise": true,
+    "no-floating-promises": true,
+    "no-void-expression": [true, "ignore-arrow-function-shorthand"]
   }
-  
+}