Preparing for fixing the filter controller.
Merge branch 'master' of https://github.com/nightsprout/tandem