Improved mapper to work with branded directories
- When searching for entities we get hidden files back in the dir list
  (brand directories are seen as hidden)
- Added a method to strip hidden (branded) directories from a path, should
  leave us with an actual base path
- Couple of other tweaks to make sure this works through the whole process
  and over CLI