Added git wdf alias (--word-diff).
Use short status.
Ignore vim *.swp.
Set autosetuprebase = always.
Merge branch 'master' of github.com:ypcs/conf

* 'master' of github.com:ypcs/conf:
  Replaced adduser with addgroup.
Fixed whitespaces.