handle both old and new paths...
Merge branch 'master' of github.com:nla/banjo