Unmerging fetchmailrc
Merge branch 'cyrus' of github.com:verdammelt/dotfiles into cyrus
Merge remote-tracking branch 'refs/remotes/origin/master' into cyrus

Conflicts:
	.fetchmailrc
merging from remote
Merge branch 'master' into cyrus
Setting up hyperspec.
Tweaks to org mode.
New useful abbrevs.
Merge branch 'cyrus' of github.com:verdammelt/dotfiles into cyrus

Conflicts:
	.emacs.d/abbrev_defs
Package wrap-region appears useful.
Package elisp-slime-nav appears useful.
Merge remote-tracking branch 'refs/remotes/origin/master' into cyrus

Conflicts:
	.emacs.d/abbrev_defs
	.emacs.d/init-org.el
New abbreviations.
Turning on wrap-region mode globally.
Merge branch 'cyrus' of github.com:verdammelt/dotfiles into cyrus

Conflicts:
	.emacs.d/abbrev_defs
	.emacs.d/init-package.el
	.emacs.d/init.el
Merge branch 'master' into cyrus

Conflicts:
	.emacs.d/init-org.el
Improving work captures.
Improving work agenda with clock reporting.
Fixing dumb error.
Adding useful jump-to-clocking keybinding.