Update xinitrc
Merge conflict
Merge conflict
Remove emacs live config, see AdamClements/prelude.git for my new emacs config