Updated addresses scope for user model.
Played with getting tests running. Can at least run 'rake spec'.