Merge branch 'master' into feature/allowScalarResult

.vscode/settings.json

@@ -3,7 +3,9 @@
 	"files.exclude": {
 		"**/.git": true,
 		"**/.DS_Store": true,
-		"**/*/vsix": true,
+		"**/*.vsix": true,
 		"**/*.js": {"when": "$(basename).ts"}
 	}
+,
+"typescript.tsdk": "./node_modules/typescript/lib"
 }

CHANGELOG.md

@@ -0,0 +1 @@
+Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases).

CONTRIBUTING.md

@@ -3,7 +3,11 @@ Thanks for helping out! This guide provides some guidelines on coding styles and
 Keep in mind that these are guidelines, not rules. Use your best judgement and feel free to make suggestions!
 
 ## Workflow
-**Please read the [TrueCommerce organization's workflow documentation](https://github.com/TrueCommerce/Meta/wiki/workflow#truecommerce-workflow) before getting started.**
+Please use the follow general workflow when making contributions to the code:
+
+1. Fork the repository.
+2. Create a feature branch or commit directly to the `develop` branch.
+3. Create a pull request to request that your commits be merged to the `develop` branch of the `vscode-xml` repository. PRs submitted to the `master` branch will not be considered.
 
 
 ## Building the Extension
@@ -11,8 +15,6 @@ Keep in mind that these are guidelines, not rules. Use your best judgement and f
 2. Run the `build` task in VS Code (`CTRL + SHIFT + B`) or start extension debugging (`F5`), which will run the `build` task for you.
 
 ## Style Guide
-In short, favor clean, maintainable code over code that "just works".
-
 ### Imports
 To keep *.ts files from getting too cluttered, use a namespace alias when pulling in more than 4 or 5 objects. As a general rule, always import the `vscode` namespace using the `vsc` alias for consistency.
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 TrueCommerce, Inc.
+Copyright (c) 2015 Josh Johnson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,16 +1,20 @@
 # XML Tools for Visual Studio Code
-[![Build Status](https://travis-ci.org/TrueCommerce/vscode-xml.svg?branch=master)](https://travis-ci.org/TrueCommerce/vscode-xml)
+[![](https://img.shields.io/badge/gitter-join_chat-1dce73.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIwIiB5PSI1IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI1Ii8%2BPHJlY3QgeD0iMiIgeT0iNiIgZmlsbD0iI2ZmZiIgd2lkdGg9IjEiIGhlaWdodD0iNyIvPjxyZWN0IHg9IjQiIHk9IjYiIGZpbGw9IiNmZmYiIHdpZHRoPSIxIiBoZWlnaHQ9IjciLz48cmVjdCB4PSI2IiB5PSI2IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI0Ii8%2BPC9zdmc%2B&logoWidth=8)](https://gitter.im/vscode-xml/vscode-xml)
+[![Build Status](https://travis-ci.org/DotJoshJohnson/vscode-xml.svg?branch=master)](https://travis-ci.org/DotJoshJohnson/vscode-xml)
 
 ## Features
-* [XML Formatting](https://github.com/TrueCommerce/vscode-xml/wiki/xml-formatting)
+* [XML Formatting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-formatting)
-* [XML Tree View](https://github.com/TrueCommerce/vscode-xml/wiki/xml-tree-view)
+* [XML Tree View](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-tree-view)
-* [XPath Evaluation](https://github.com/TrueCommerce/vscode-xml/wiki/xpath-evaluation)
+* [XPath Evaluation](https://github.com/DotJoshJohnson/vscode-xml/wiki/xpath-evaluation)
-* [XQuery Linting](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-linting)
+* [XQuery Linting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-linting)
-* [XQuery Execution](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-script-execution)
+* [XQuery Execution](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-script-execution)
-* [XQuery Code Completion](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-code-completion)
+* [XQuery Code Completion](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-code-completion)
 
 ## Release Notes
-Detailed release notes are available [here](https://github.com/TrueCommerce/vscode-xml/releases).
+Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases).
 
 ## Issues
-Run into a bug? Report it [here](https://github.com/TrueCommerce/vscode-xml/issues).
+Run into a bug? Report it [here](https://github.com/DotJoshJohnson/vscode-xml/issues).
+
+## Roadmap
+Check out development progress [here](https://github.com/DotJoshJohnson/vscode-xml/projects/1).

package.json

@@ -2,24 +2,24 @@
 	"name": "xml",
 	"displayName": "XML Tools",
 	"description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"publisher": "DotJoshJohnson",
 	"author": {
-		"name": "TrueCommerce",
+		"name": "Josh Johnson",
-		"url": "https://github.com/TrueCommerce"
+		"url": "https://github.com/DotJoshJohnson"
 	},
-	"icon": "resources/icon.png",
+	"icon": "resources/xml.png",
 	"galleryBanner": {
 		"color": "#FFFFFF",
 		"theme": "light"
 	},
-	"homepage": "https://github.com/TrueCommerce/vscode-xml/wiki",
+	"homepage": "https://github.com/DotJoshJohnson/vscode-xml",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/TrueCommerce/vscode-xml/wiki"
+		"url": "https://github.com/DotJoshJohnson/vscode-xml.git"
 	},
 	"bugs": {
-		"url": "https://github.com/TrueCommerce/vscode-xml/wiki"
+		"url": "https://github.com/DotJoshJohnson/vscode-xml/issues"
 	},
 	"engines": {
 		"vscode": "^0.10.7",