Restore functionality by removing extraneous return
Remove unecessary code path
Merge branch 'master' into fix-volume-magnitude

Conflicts:
	test/filters/test_filters.py
Use isinstace basestring instead of type

It is the recommended way of checking if a variable is a string.
Merge pull request #37 from alphagov/fix-volume-magnitude

Restore functionality by removing extraneous return