added hardcoded domain for canonical to redirect .net
updated config file to not redirect local and hopefully work better!
Merge branch 'master' into develop