Merge pull request JuliaIO#42 from aviks/master

Update License

LICENSE.md

@@ -1,7 +1,7 @@
 The Julia JSON package is licensed under the MIT License:
 
-> Copyright (c) 2012: Avik Sengupta, Stefan Karpinski, David de Laat 
-> and other contributors: https://github.com/aviks/JSON.jl/contributors
+> Copyright (c) 2012: Avik Sengupta, Stefan Karpinski, David de Laat, 
+> Dirk Gadsen and other contributors: https://github.com/aviks/JSON.jl/contributors
 > 
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the
@@ -21,32 +21,3 @@ The Julia JSON package is licensed under the MIT License:
 > 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.
-
-Parts of this software based on "(another) JSON Parser" by François Glineur,
-which is licensed under the BSD License:
-
-> Copyright (c) 2011, François Glineur
-> All rights reserved.
-> 
-> Redistribution and use in source and binary forms, with or without 
-> modification, are permitted provided that the following conditions are 
-> met:
-> 
->  * Redistributions of source code must retain the above copyright 
->   notice, this list of conditions and the following disclaimer.
->  * Redistributions in binary form must reproduce the above copyright 
->   notice, this list of conditions and the following disclaimer in 
->   the documentation and/or other materials provided with the distribution
->   
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-> ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-> LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-> CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-> SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-> INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-> CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-> ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-> POSSIBILITY OF SUCH DAMAGE.
-