added trash func
updated git aliases