User profiles changes
Merge branch 'master' of https://github.com/dshurt/Open-Storefront
Merge branch 'master' of https://github.com/dshurt/Open-Storefront
Merge pull request #45 from gebagley/master

Commit some user profile changes.