Added include: try including local (machine-specific) settings.
Merge branch 'master' of github.com:ypcs/conf

* 'master' of github.com:ypcs/conf:
  Added configuration for select-editor.
  Added configuration for keynav.
  Add ~/bin to PATH if exists.