Merge pull request #279 from Holzhaus/update-readme

Update readme

AUTHORS.md

@@ -0,0 +1,23 @@
+Jasper was originally created by Shubhro Saha and Charles Marsh in early 2014.
+In August 2014, the core development team has been joined by Jan Holthuis.
+
+    Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
+    Charles Marsh <crmarsh@princeton.edu>
+    Shubhro Saha <saha@princeton.edu>
+
+Here is a probably incomplete list of contributors, that helped to improve
+Jasper. Thanks a lot!
+
+    Alex Bate <alex@alexbate.co.uk>
+    Andy Buckingham <andy@andybee.com>
+    David Celis <me@davidcel.is>
+    Cedric Claidiere
+    dag0310
+    Alex Siri
+    Andrew Stahlman <andrew.stahlman@gmail.com>
+    James Timmons
+
+*Please alphabetize new entries*
+
+We'd also like to thank all the people who reported bugs, helped
+answer newbie questions, and generally made Jasper better.

LICENSE.md

@@ -0,0 +1,21 @@
+# The MIT License (MIT)
+
+*Copyright (c) 2014-2015 Charles Marsh, Shubhro Saha & Jan Holthuis*
+
+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:
+
+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

@@ -9,7 +9,7 @@ Learn more at [jasperproject.github.io](http://jasperproject.github.io/), where
 
 ## Contributing
 
-If you'd like to contribute to Jasper, please read through our **[Contributing Guide](https://github.com/jasperproject/jasper-client/blob/master/CONTRIBUTING.md)**, which outlines the philosophies to preserve, tests to run, and more. We highly recommend reading through this guide before writing any code.
+If you'd like to contribute to Jasper, please read through our **[Contributing Guide](CONTRIBUTING.md)**, which outlines the philosophies to preserve, tests to run, and more. We highly recommend reading through this guide before writing any code.
 
 The Contributing Guide also outlines some prospective features and areas that could use love. However, for a more thorough overview of Jasper's direction and goals, check out the **[Product Roadmap](https://github.com/jasperproject/jasper-client/wiki/Roadmap)**.
 
@@ -23,35 +23,23 @@ If you're still having trouble, the next place to look would be the new **[Googl
 
 ## Contact
 
-Jasper was originally created by [Shubhro Saha](http://www.princeton.edu/~saha/) and [Charles Marsh](http://www.princeton.edu/~crmarsh/). Both can be reached by email at [saha@princeton.edu](mailto:saha@princeton.edu) and [crmarsh@princeton.edu](mailto:crmarsh@princeton.edu) respectively. However, for technical support and other problems, please go through the channels mentioned above.
+Jasper's core developers are [Shubhro Saha](http://www.princeton.edu/~saha/), [Charles Marsh](http://www.princeton.edu/~crmarsh/) and [Jan Holthuis](http://homepage.ruhr-uni-bochum.de/Jan.Holthuis/).  All of them can be reached by email at [saha@princeton.edu](mailto:saha@princeton.edu), [crmarsh@princeton.edu](mailto:crmarsh@princeton.edu) and [jan.holthuis@ruhr-uni-bochum.de](mailto:jan.holthuis@ruhr-uni-bochum.de) respectively. However, for technical support and other problems, please go through the channels mentioned above.
+
+For a complete list of code contributors, please see [AUTHORS.md](AUTHORS.md).
 
 ## Major Updates
+- 2015-01-07: [Added a new STT engine](https://github.com/jasperproject/jasper-client/pull/229) for Wit.ai
+- 2014-11-05: [Added a new TTS engine](https://github.com/jasperproject/jasper-client/pull/229) for MaryTTS
+- 2014-10-13: [Brand-new vocabulary compiler](https://github.com/jasperproject/jasper-client/pull/181) that introduces versioning, so that compilation is only performed when needed.
+- 2014-09-27: [Improved TTS implementation](https://github.com/jasperproject/jasper-client/pull/155) and new TTS engines for Festival, SVOX Pico and Google TTS.
 - 2014-08-09: [Modularized STT implementation](https://github.com/jasperproject/jasper-client/pull/118) with Google Speech API example, thanks to astahlman. Running `populate.py` after updating is highly recommended.
 - 2014-07-11: More [platform-independent audio output](https://github.com/jasperproject/jasper-client/pull/100). Thank you, astahlman!
 - 2014-05-27: The network setup wizard has been removed because of unreliability. The client code and documentation has been updated, requiring new users to manually configure their `/etc/network/interfaces` file.
 
 ## License
 
-Jasper is released under the MIT license, a permissive free software license that lets you do anything you want with the source code, as long as you provide back attribution and ["don't hold \[us\] liable"](http://choosealicense.com). Note that this licensing only refers to the Jasper client code (i.e.,  the code on GitHub) and not to the disk image itself (i.e., the code on SourceForge).
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Charles Marsh & Shubhro Saha
-
-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:
+*Copyright (c) 2014-2015, Charles Marsh, Shubhro Saha & Jan Holthuis. All rights reserved.*
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Jasper is covered by the MIT license, a permissive free software license that lets you do anything you want with the source code, as long as you provide back attribution and ["don't hold \[us\] liable"](http://choosealicense.com). For the full license text see the [LICENSE.md](LICENSE.md) file.
 
-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.
+*Note that this licensing only refers to the Jasper client code (i.e.,  the code on GitHub) and not to the disk image itself (i.e., the code on SourceForge).*

jasper.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8-*-
+
 import os
 import sys
 import shutil
@@ -113,10 +114,10 @@ def run(self):
 
 if __name__ == "__main__":
 
-    print("===========================================================")
-    print(" JASPER The Talking Computer                               ")
-    print(" Copyright 2013 Shubhro Saha & Charlie Marsh               ")
-    print("===========================================================")
+    print("*******************************************************")
+    print("*             JASPER - THE TALKING COMPUTER           *")
+    print("* (c) 2015 Shubhro Saha, Charlie Marsh & Jan Holthuis *")
+    print("*******************************************************")
 
     logging.basicConfig()
     logger = logging.getLogger()