giving up on CDPATH
rebase w/master
merge w/origin