Cut release from 81e76f675634f1b42c8c3070c73443f3f68f8624

Author: tandembot

LICENSE.txt

@@ -1,14 +1,7 @@
-                       Copyright (c) [2018] [Team Lightly]
-
-                        "Lightly-Modified Apache License"
-                         A Variant of the Apache License
-
-                          View the Apache License at:
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
-                Our license adds clause 4.(e) to the Apache License
-
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
    1. Definitions.
@@ -127,11 +120,6 @@
           that such additional attribution notices cannot be construed
           as modifying the License.
 
-     (e) Any Derivative Works may not be configured to use the default server
-         provided by the Copyright holders. You must configure all Derivative
-         Works to use servers owned by You, or servers You are otherwise
-         authorized to use.
-
       You may add Your own copyright statement to Your modifications and
       may provide additional or different license terms and conditions
       for use, reproduction, or distribution of Your modifications, or

README.md

@@ -40,21 +40,27 @@ Please use one of the following commands:
 It is recommended to leave the session before exiting vim, but that process
 should be automated.
 
+## Terms of Service
+By using Tandem, you agree that any modified versions of Tandem will not use
+the rendezvous server hosted by the owners. You must host and use your own copy
+of the rendezvous server. We want to provide a good user experience for Tandem,
+and it would be difficult to do that with modified clients as well.
+
+You can launch the rendezvous server by running `python3 ./rendezvous/main.py`.
+Change the address of the rendezvous server used by the agent in the
+configuration file to point to your server's host. This file is located at:
+`plugin/tandem_lib/agent/tandem/agent/configuration.py`
+
 ## License
 Copyright (c) 2018 Team Lightly
 
-Licensed under the "Lightly-Modified Apache License", a variant of the Apache
-License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. 
-
 See [LICENSE.txt](LICENSE.txt)
 
-This license is essentially the Apache License 2.0, except for an added a
-clause that requires you to use your own servers instead of ours if you do
-modify Tandem.  
-You can also modify this in the configuration file at:
-`agent/tandem/agent/configuration.py`
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
 
+http://www.apache.org/licenses/LICENSE-2.0
 ## Authors
 Team Lightly  
 [Geoffrey Yu](https://github.com/geoffxy), [Jamiboy