Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --cc FS/FS/Conf.pm
index 72421c7,7dbc2eb..e066225
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -4321,8 -4321,8 +4321,9 @@@ and customer address. Include units.'
      'description' => 'Method for standardizing customer addresses.',
      'type'        => 'select',
      'select_hash' => [ '' => '', 
+                        'uscensus' => 'U.S. Census Bureau',
                         'usps'     => 'U.S. Postal Service',
 +                       'uscensus' => 'U.S. Census Bureau',
                         'tomtom'   => 'TomTom',
                         'melissa'  => 'Melissa WebSmart',
                       ],