Merge pull request #23 from minty-boo/master

Differentiate between word/symbol logical operators

Author: sumneko

lua.tmLanguage.json

@@ -196,9 +196,13 @@
 			"name": "support.function.library.lua"
 		},
 		{
-			"match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
+			"match": "\\b(\\|\\||\\&\\&|\\!)\\b",
 			"name": "keyword.operator.lua"
 		},
+		{
+			"match": "\\b(and|or|not)\\b",
+			"name": "keyword.operator.logical.lua"
+		},
 		{
 			"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
 			"name": "support.function.any-method.lua"