This has the fix in it from the View breaking when a user tried to view his profile. Its a minor change.
Merge branch 'master' of https://github.com/blakeyoder/salk_app