prioritize /usr/local/bin over /usr/bin
consolidate os x paths/aliases, fix linux java home