Update the markup and styling on org contacts

- Calling render with a collection and a local variable will persist
  that variable through each itteration. So if you add to that variable
  in one itteration it will be there in the next iteration. This was
  happening on `_contact.html.erb`.
- Updated the styling to handle the new markup, and new position of
  comments.
- Merged the `simple` and `complex` styles as the are now displayed
  virtually identically.
- Moved the `simple` and `complex` logic into the contact partial as it
  didn't seem to fit outside.