Removed commented-out blocks from emacs23.
Removed xclip
Removed vim-mode.
Added vim-mode.
Merge branch 'emacs23' of https://github.com/jdkaplan/dot-emacs-dot-d

Conflicts:
	init.el