Add edit-fn and edit-which commands
Merge remote-tracking branch 'origin/master'
Update aliases
Update gitconfig