Update fish and ranger settings.
Add .xinitrc and .Xresources.
Update README.md
Resolve merge conflict.