improved the bootstrap a bit to use less dirname functions
Merge branch 'master' of https://github.com/kirbycms/core