From de07e957fba1c335d688854f7ef8ff8e823316fc Mon Sep 17 00:00:00 2001
From: subtly <subtly>
Date: Mon, 6 Jul 2015 19:26:10 -0700
Subject: [PATCH] Cleanup. More fixes. More tests.