Cleanup
Refactoring filters
Merge pull request #37 from postcode/oakland-staging

Oakland staging
Merge branch 'oakland-production' of github.com:/postcode/recordtrac