Merge branch 'dev'

Author: dmolsen

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Dave Olsen, http://dmolsen.com
+Copyright (c) 2014 Dave Olsen, http://dmolsen.com 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

composer.json

@@ -31,9 +31,9 @@
 		"patternlab": {
 			"config": [
 				{ 
-					"patternExtension": "twig",
-					"lineageMatch": "{%([ ]+)?include [\"\']([A-Za-z0-9-_]+)[\"\'](.*)%}",
+					"lineageMatch": "{%([ ]+)?include ["\\']([A-Za-z0-9-_]+)["\\'](.*)%}",
 					"lineageMatchKey": 2,
+					"patternExtension": "twig",
 					"twigDebug": false,
 					"twigDefaultDateFormat": "",
 					"twigDefaultIntervalFormat": "",