Merge pull request #1199 from jenshnielsen/contact_info

Update contact info

CONTRIBUTING.rst

@@ -4,9 +4,9 @@ Contributing
 Hi, thanks for your interest in the project! We welcome pull requests
 from developers of all skill levels.
 
-Jens H. Nielsen ([email protected]), William H.P Nielsen
-(william@nbi.ku.dk), Dominik Vogel ([email protected]), and
-Sohail Chatoor (a-sochat@microsoft.com) are the current maintainers of
+Jens H. Nielsen ([email protected]), William H.P Nielsen
+([email protected]@nbi.ku.dk), Dominik Vogel ([email protected]), and
+Mikhail Astafev (a-miasta@microsoft.com) are the current maintainers of
 QCoDeS (aka core developers), along with a group of talented and smart
 volunteers. Please don't hesitate to reach out if you have any
 questions, or just need a little help getting started.

docs/help.rst

@@ -13,18 +13,11 @@ Chat
 
 We discuss things on slack, join us!
 You can find the maintainers' email on their commits.
-Plese send a mail to j.h.nielsen(at)nbi.ku.dk if you want to join
+Please send a mail to Jens.Nielsen(at)microsoft.com if you want to join
 the slack channel. Please include a few lines about who you are and 
 how you use or want to use QCoDeS.
 
 
-Office hours
-------------
-
-QCoDeS core developers have office hours every second week.
-Everybody is welcome to join, if you want to know more send us an email.
-
-
 More
 ----
 For more info  on how to contribute check out the :ref:`Community` section.

setup.py

@@ -37,7 +37,7 @@ def readme():
       use_2to3=False,
 
       maintainer='Jens H Nielsen',
-      maintainer_email='[email protected]',
+      maintainer_email='[email protected]',
       description='Python-based data acquisition framework developed by the '
                   'Copenhagen / Delft / Sydney / Microsoft quantum computing '
                   'consortium',