Merge with master

Author: Steve Calvert

README.md

@@ -22,7 +22,7 @@ jshint:{
             // The task fails if force is set to false. With true, it shows the
             // linting errors, but continues
             force: false,
-            jshintrc: 'node_modules/mobify-code-style/javascript/jshintrc.js'
+            jshintrc: 'node_modules/mobify-code-style/javascript/.jshintrc'
         }
     }
 }
@@ -33,7 +33,7 @@ Sample jscs config:
 ```javascript
 jscs: {
     options: {
-        config: 'node_modules/mobify-code-style/javascript/jscsrc.js'
+        config: 'node_modules/mobify-code-style/javascript/.jscsrc'
     },
     src: ['src/**/*.js']
 }

javascript/jscsrc.js javascript/.jscsrcjavascript/jscsrc.js renamed to javascript/.jscsrc

@@ -4,7 +4,6 @@
   "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
-  "disallowQuotedKeysInObjects": "allButReserved",
   "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
@@ -20,4 +19,4 @@
   "validateIndentation": 4,
   "validateLineBreaks": "LF",
   "validateQuoteMarks": "'"
-}
+}

javascript/jshintrc.js javascript/.jshintrcjavascript/jshintrc.js renamed to javascript/.jshintrc

@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Code style guide and linting tools for Mobify",
   "main": "index.js",
   "scripts": {