renaming hostname to endpoint to paint a better picture
Merge branch 'switching_from_httpget_to_httphead' into dissallowing_host_ping_redirects

Conflicts:
	core/src/main/java/com/novoda/merlin/Merlin.java