Reverted the variables EDITOR and VISUAL; rlwrapped the twelf-server; updated PATH; switched terminal to urxvt and made the soloarized color scheme work for both urxvt and vim; overrode cd to remember the previous working directory so as to restore in a new terminal instance
Disabled deadkeys for the keyboard in X; switched to IBus; made urxvt run as a daemon
Made bash history display time stamps
Renamed file
Merge branch 'master' of github.com:plmday/DotFiles

Conflicts:
	.bashrc
	.xmonad/xmonad.hs