Universally moving to utilize Pathname.
Avoid r-creating the object all the time.
Oops, this shouldn't be checked in...
Merge branch 'master' into automatic_defaults