Cleanup `public_dir` handling
Merge pull request #779 from vipulnsward/public_dir

Cleanup `public_dir` handling