fix rm on osx; add cd shortcuts