Updated to adjust for cutoff mappings due to short field
Merge branch 'automunge' of git://github.com/rjc123/redirector into automunge