photo displays on friends page and fixed the add friend bug.
Merge pull request #45 from edatrix/friends-page-photo

photo displays on friends page and fixed the add friend bug.
reduced duplication in format_for_views method
Merge pull request #46 from edatrix/code-climate-refactor

reduced duplication in format_for_views method
reduced duplication in friendships controller
Merge pull request #47 from edatrix/code-climate-refactor

reduced duplication in friendships controller
Merge branch 'master' into travisCI
travis CI stuff in spec helper