Refactor user/group code to be less indented
Merge branch 'master' of github.com:ogham/exa

Conflicts:
	unix.rs