Merge branch 'master' of github.com:coralproject/talk into enh-test

.eslintignore

@@ -1 +0,0 @@
-test/*.conf.js

.gitignore

@@ -1,8 +1,5 @@
-/node_modules
-/npm-debug.log
-/build
-/server/widgets/*.js
-/server/widgets/*.html
+node_modules
+npm-debug.log
+dist
 .DS_Store
-config.json
 *.iml

package.json

@@ -2,9 +2,9 @@
   "name": "talk",
   "version": "0.0.1",
   "description": "A commenting platform from The Coral Project. https://coralproject.net",
-  "main": "./server/bin/www",
+  "main": "app.js",
   "scripts": {
-    "start": "./server/bin/www",
+    "start": "./bin/www",
     "lint": "eslint .",
     "test": "mocha"
   },