Fix internal navigation errors

*Comments and profile pages now display avatars belonging to owners, rather than user
Merge pull request #41 from zhbanton/avatar_and_nav

Fix internal navigation errors
Merge branch 'master' of github.com:zhbanton/photo_mixer into styling

Conflicts:
	app/views/profile/show.html.erb