Removing the URL configuration as we are always using the absolute root in all urls.  This will make it easier to deploy to production
Updating dev branch to match master
Merge remote-tracking branch 'origin/jmw-dev' into jmw-dev

Conflicts:
	source/index.html.twig
Updating dev branch to match master