Update URLs
Merge branch 'master' into dreamhost