Added short status git alias
Use less -r as the default pager
Always pull with rebase, not merge
Log merge commits
Merge branch 'master' of github.com:kratorius/conf-files

* 'master' of github.com:kratorius/conf-files:
  Include .local/bin as user-local PATH dir