Fix #104 - Improve hostname/aliases logic

This was causing duplicate host entries to be added as the first site
host was re-used in both places. Now it's removed from the aliases.