add pretty printed status bar to xmonad
disable up and down for history
disable gvim bell
new identity file for ssh
fix xmonad startup hook for java
merge conflicts in a 3-way fashion
remove fugitive
use splice as a mergetool instead