doesn't assume user has 'set autochdir' set
Merge pull request #497 from johnathanz/master

doesn't assume user has 'set autochdir' set