Added File.cwd, closes #87
Merge branch 'master' into 2.9