Feature/master/pup 1551 environmentpath

First pass at broadening the new environmentdir setting to be an environmentpath setting.