Setting up C mode.
Setting up pretty mode.
new abbrevs.
Fixing dumb merge crap.
New function for doing updates.
Binding M-Z to zap-up-to-char.
Setting up default browse-kill-ring keybindings.

Conflicts:
	.emacs.d/init.el
Updating abbrevs.

Conflicts:
	.emacs.d/abbrev_defs
Removing some merge conflict cruft.

Conflicts:
	.emacs.d/init-org.el
Removing unused functions.
No longer using S-g for goto-line.
Adding some addition wrap-region characters.

Conflicts:
	.emacs.d/init-misc.el
Switching to different theme. (tango-light)

Conflicts:
	.emacs.d/init.el
Removing Timestamps.

They only cause problems during merges. Where useful in the days before
checking all these into GIT.
unmerging fetchmail
Setting up default browse-kill-ring keybindings.
Removing some merge conflict cruft.
Setting up multiple-cursors.
Adding some addition wrap-region characters.
Switching to different theme. (tango-light)