update read me with upgrade function
remove ls aliases
use subl as git editor
do not keep backups after merge