Allow routing to the vendor directory
Merge branch 'sharils' into wip