diff --git a/.travis.yml b/.travis.yml
index 9e79eb13b..10f2a4d73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,23 +5,18 @@ python:
   - "3.7"
   - "3.8"
 
-services:
-  - docker
-
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
 
 install:
   - pip install --upgrade pipenv
-  - pipenv install --dev
+  - pipenv install --system --dev
 
 script:
   - cd src/
   - pipenv run pytest --cov
   - pipenv run pycodestyle
-  - cd ..
-  - docker build --tag=jonaswinkler/paperless-ng .
 
 after_success:
   - pipenv run coveralls
diff --git a/docs/_static/recommended_workflow.png b/docs/_static/recommended_workflow.png
new file mode 100644
index 000000000..bbab0bb34
Binary files /dev/null and b/docs/_static/recommended_workflow.png differ
diff --git a/docs/administration.rst b/docs/administration.rst
index a52d7753d..275883a2f 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -294,10 +294,14 @@ Documents can be stored in Paperless using GnuPG encryption.
 
 .. danger::
 
-    Decryption is depreceated since paperless-ng 1.0 and doesn't really provide any
+    Decryption is depreceated since paperless-ng 0.9 and doesn't really provide any
     additional security, since you have to store the passphrase in a configuration
-    file on the same system as the encrypted documents for paperless to work. Also,
-    paperless provides transparent access to your encrypted documents.
+    file on the same system as the encrypted documents for paperless to work.
+    Furthermore, the entire text content of the documents is stored plain in the
+    database, even if your documents are encrypted. Filenames are not encrypted as
+    well.
+    
+    Also, the web server provides transparent access to your encrypted documents.
 
     Consider running paperless on an encrypted filesystem instead, which will then
     at least provide security against physical hardware theft.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index d5bedef59..36dc9e5cc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,10 +8,8 @@ Changelog
 paperless-ng 0.9.0
 ##################
 
-* **Deprecated:** GnuPG. Don't use it. If you're still using it, be aware that it
-  offers no protection at all, since the passphrase is stored alongside with the
-  encrypted documents itself. This features will most likely be removed in future
-  versions.
+* **Deprecated:** GnuPG. :ref:`See this note on the state of GnuPG in paperless-ng. <utilities-encyption>`
+  This features will most likely be removed in future versions.
 
 * **Added:** New frontend. Features:
 
@@ -97,7 +95,7 @@ paperless-ng 0.9.0
   * The presence of ``PAPERLESS_DBHOST`` now determines whether to use PostgreSQL or
     sqlite.
   * ``PAPERLESS_OCR_THREADS`` is gone and replaced with ``PAPERLESS_TASK_WORKERS`` and
-    ``PAPERLESS_THREADS_PER_WORKER``. See TODO for details.
+    ``PAPERLESS_THREADS_PER_WORKER``. Refer to the config example for details.
 
 * Many more small changes here and there. The usual stuff.
 
diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst
index 365defcce..bd17a845b 100644
--- a/docs/usage_overview.rst
+++ b/docs/usage_overview.rst
@@ -135,6 +135,7 @@ REST API
 
 You can also submit a document using the REST API, see :ref:`api-file_uploads` for details.
 
+
 .. _usage-recommended_workflow:
 
 The recommended workflow
@@ -146,6 +147,10 @@ is as follows. This workflow also takes into account that some documents
 have to be kept in physical form, but still ensures that you get all the
 advantages for these documents as well.
 
+The following diagram shows how easy it is to manage your documents.
+
+.. image:: _static/recommended_workflow.png
+
 Preparations in paperless
 =========================
 
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index a08e492f8..52cf7dcc6 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -450,12 +450,14 @@ class TestConsumer(TestCase):
     def setUp(self):
         self.scratch_dir = tempfile.mkdtemp()
         self.media_dir = tempfile.mkdtemp()
+        self.consumption_dir = tempfile.mkdtemp()
 
         override_settings(
             SCRATCH_DIR=self.scratch_dir,
             MEDIA_ROOT=self.media_dir,
             ORIGINALS_DIR=os.path.join(self.media_dir, "documents", "originals"),
-            THUMBNAIL_DIR=os.path.join(self.media_dir, "documents", "thumbnails")
+            THUMBNAIL_DIR=os.path.join(self.media_dir, "documents", "thumbnails"),
+            CONSUMPTION_DIR=self.consumption_dir
         ).enable()
 
         patcher = mock.patch("documents.parsers.document_consumer_declaration.send")
@@ -473,6 +475,7 @@ class TestConsumer(TestCase):
     def tearDown(self):
         shutil.rmtree(self.scratch_dir, ignore_errors=True)
         shutil.rmtree(self.media_dir, ignore_errors=True)
+        shutil.rmtree(self.consumption_dir, ignore_errors=True)
 
     def get_test_file(self):
         fd, f = tempfile.mkstemp(suffix=".pdf", dir=self.scratch_dir)