Cleaned up xinitrc and added Xmodmap/Xresources initialization in the xinitrc script.