Fix indentation tracking
Split out script argument parsing
Add directory support to pss
Merge branch 'dev/per-site-settings' into mathstuf/next

* dev/per-site-settings:
  Add directory support to pss
  Split out script argument parsing
  Fix indentation tracking