Merge pull request #97 from robert-cody/doc_fix_and_gitignore

Doc fix and gitignore

diff --git a/.gitignore b/.gitignore
index f456abc935db5e200c64aee6e22a76d00f3976b8..b0df7f7c2e9b412a5d54b9f55af83ca7e38e2d9e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,12 @@ output/*.html
 output/*/index.html
 
 # Sphinx
-docs/_build
\ No newline at end of file
+docs/_build
+
+# IntelliJ IDEA
+/.idea/
+/out/
+*.iml
+
+# Local virtualenv directories
+/venv*/
\ No newline at end of file

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 179d86c29b0a58270f256cf59f7b643aba635da1..7451fcb8dc8be8009b26450ec8ef192aecb0a73d 100644 (file)
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -113,4 +113,5 @@ Tips
 
 To run a subset of tests::
 
-       $ python -m unittest tests.test_cached-property
\ No newline at end of file
+       $ python -m unittest tests.test_cached-property
+