Fixing addressfield settings.
Merge remote-tracking branch 'carsonblack/housing' into housing

* carsonblack/housing:
  Fixing addressfield settings.