include /Developer/usr/bin in PATH
add completion dots, remove commented out garbage, add mergetool alias
update subl