Now uses cUrl to test urls
Merge branch 'master' into live