diff --git a/.gitignore b/.gitignore
index c0e97c8767..0b8e9359df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .config.json
 .dist
 .jshintignore
-.jshintrc
 .npm
 .project
 .sessions.json
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000000..a55b4ddc8a
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,13 @@
+{
+    "asi": true,        // allow missing semicolons
+    "curly": true,      // require braces
+    "eqnull": true,     // ignore ==null
+    "forin": true,      // require property filtering in "for in" loops
+    "immed": true,      // require immediate functions to be wrapped in ( )
+    "nonbsp": true,     // warn on unexpected whitespace breaking chars
+    //"strict": true,   // commented out for now as it causes 100s of warnings, but want to get there eventually
+    //"unused": true,   // Check for unused functions and variables
+    "loopfunc": true,   // allow functions to be defined in loops
+    //"expr": true,       // allow ternery operator syntax...
+    "sub": true         // don't warn that foo['bar'] should be written as foo.bar
+}