Added new aliases

last, display the ten last commits
yesterday, pretty print the commit you've done yersterday.
Useful to remember what you've been working on.
Added default tool for merge conflicts
Enable rerere by default
Modified some core behaviors