Move .xinitrc into .bashrc
Update bashrc and xinitrc