notes
notes
remove newline-mark from the default value of whitespace-style

newline-mark in whitespace-style leads to strange column jumping after
empty lines and interferes with popup.el, so remove it from the
default setting
bump org-mode to current master

there was an issue with jumpy M-RET handling, which is fixed now.
make elpy use the python source from the git repo

this ensures that lisp and python code match each other. also it is
not necessary anymore to install python-elpy anymore to get basic
functionality.
notes
support for proper color themes together with two hi contrast examples

introduces a customizable list cycle-themes, which holds a list of
theme symbols. the function cycle-themes can be repeatedly called to
switch through those themes.

the first theme will be loaded on start-up.
bump version of elpy to make "project specific elpy-rpc processes" available

refer to the pull request
https://github.com/jorgenschaefer/elpy/pull/86 for more information.
add capture configuration (coroa)
custom.el stuff (coroa)
work around a readline issue by setting TERM to linux before calling python
Merge branch 'master' of github.com:chaoflow/.emacs.d
add documentation about color themes to Notes.org
Merge branch 'color-themes'

Conflicts:
	Notes.org
fix tramp path problem upon accessing nixos machines
Merge branch 'master' into notmuch

Conflicts:
	init.el
	setup-whitespace.el
notmuch-search: show deleted entries with subdued foreground
fix small bug where epa-mail-mode was not require'd on time
notmuch-search: update tags of current thread upon returning to search buffer