tweaks to w model parameter and directory handling
Merge branch 'master' of git@github.com:jessecusack/emapex