Merge pull request #33 from JustAboutJeff/user_profile

User profile WIP
updated seeds includes some location_settings
location_settings show page, and profile view
Merge pull request #34 from JustAboutJeff/location_settings_show

Location settings show
Fixed merge conflict