Arthur: Changed django.conf.urls.defaults to django.conf.urls (deprecated in 1.4, will be removed in Django 1.6)

Signed-off-by: Martin Stone <martin@d7415.co.uk>
Arthur: Fixed problem introduced in django/d51fb74360b94f2a856573174f8aae3cd905dd35, requiring an ALLOWED_HOSTS section in Arthur/settings.py. This patch fetches the required URLs from merlin.cfg.

Signed-off-by: Martin Stone <martin@d7415.co.uk>