Status view now has contact information
Merge branch 'master' of github.com:opinkerfi/adagios

Conflicts:
	adagios/status/templates/status_contact.html
	adagios/status/templates/status_contacts.html
	adagios/status/views.py
Resolved conflicts
Resolved conflicts