Ensure /current/bin is on PATH if a default is set 

N.B. this change depends on pull #125 (but is unrelated) to avoid having to do complicated merges of both.  If the first change is merged this one should only be a single commit.