add link from profile to edit_profile
add user changes in profile page
update redirects in user controller

To reflect path change of edit profile.
add flash to application.html.erb because previous notices no longer show up
remove display of user changes on main wiki page
fix conflicts in users/show.html.erb
Merge pull request #43 from elreimundo/update_profile_page

Update profile page