Merge branch 'master' of github.com:graphql-python/graphene-gae

Author: ekampf

.travis.yml

@@ -20,5 +20,6 @@ script:
   - make deps
   - make test
   - make coverage
+  - make lint
 
 after_success: coveralls

CONTRIBUTING.rst

@@ -99,8 +99,8 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, and 3.4, and for PyPy. Check
-   https://travis-ci.org/ekampf/graphene_gae/pull_requests
+3. The pull request should work for Python 2.7 (because thats what GAE runs). Check
+   https://travis-ci.org/graphql-python/graphene_gae/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
 Tips

README.rst

@@ -2,11 +2,11 @@
 Graphene GAE
 ===============================
 
-.. image:: https://travis-ci.org/ekampf/graphene-gae.svg
-        :target: https://travis-ci.org/ekampf/graphene-gae
+.. image:: https://travis-ci.org/graphql-python/graphene-gae.svg
+        :target: https://travis-ci.org/graphql-python/graphene-gae
 
-.. image:: https://coveralls.io/repos/github/ekampf/graphene-gae/badge.svg?branch=master
-        :target: https://coveralls.io/github/ekampf/graphene-gae?branch=master
+.. image:: https://coveralls.io/repos/github/graphql-python/graphene-gae/badge.svg?branch=master
+        :target: https://coveralls.io/github/graphql-python/graphene-gae?branch=master
 
 .. image:: https://img.shields.io/pypi/v/graphene-gae.svg
         :target: https://pypi.python.org/pypi/graphene-gae