fix join on addresses; use lowercase column names
Merge branch 'master' of github.com:CruGlobal/sp