Added edit-conflicts alias for git

- taken from https://coderwall.com/p/j7kxsa is handy for opening up all the
  files with conflicts as result of a merge in one go
Added lein to bin
Added amnesia/recall/forgetfulness aliases for git

-- allow one to ignore changes in files that have been previously committed.