Merge pull request #36 from jugglingnutcase/with-our-powers-combined

With our powers combined

Author: jrsconfitto

.gitignore

@@ -0,0 +1 @@
+node_modules

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/PowerShell"]
+	path = vendor/PowerShell
+	url = https://github.com/SublimeText/PowerShell.git

LICENSE.md

@@ -1,6 +1,4 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 James R Sconfitto
+Copyright (c) 2014-2015 James R Sconfitto
 
 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 the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -10,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-Contains code from Atom's [language-csharp](https://github.com/atom/language-csharp) repository:
+Contains code from Atom's [language-csharp](https://github.com/atom/language-csharp) repository released under the following license:
 
 Copyright (c) 2014 GitHub Inc.
 
@@ -20,14 +18,14 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-This package was derived from a TextMate bundle located at https://github.com/wintermi/csharp-tmbundle by Matthew Winter @wintermi and Adam Lickel @lickel and distributed under the following license, located in README.markdown:
+---
 
-This bundle is dual-licensed under MIT and GPL licenses.
+Utilizes grammar files and code from https://github.com/SublimeText/PowerShell, which is released under the following license:
 
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-Use it, change it, fork it, sell it. Do what you will, but please leave the author attribution.
+Copyright (c) 2011 Guillermo López-Anglada
 
----
+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 the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-This package was derived from [David Peckham's](https://github.com/davidpeckham) textmate [powershell bundle](https://github.com/davidpeckham/powershell.tmbundle).
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -3,13 +3,9 @@
 [![Build Status](https://travis-ci.org/jugglingnutcase/language-powershell.svg?branch=master)](https://travis-ci.org/jugglingnutcase/language-powershell)
 [![Build status](https://ci.appveyor.com/api/projects/status/ru4cfpi46m4bn5od/branch/master)](https://ci.appveyor.com/project/jugglingnutcase/language-powershell/branch/master)
 
-This package highlights PowerShell syntax in the [Atom editor](https://atom.io).
+This package provides PowerShell language support in the [Atom editor](https://atom.io).
 
 ## Language references
 
 i just found this [helpful blog post](http://blogs.msdn.com/b/powershell/archive/2006/05/10/594535.aspx) on the
 PowerShell grammar. i hope i *parse* :stuck_out_tongue_winking_eye: it well.
-
-This was converted from [@davidpeckham]'s [PowerShell textmate bundle](https://github.com/davidpeckham/powershell.tmbundle). Thanks [@davidpeckham]!
-
-[@davidpeckham]:https://github.com/davidpeckham