add documentation about color themes to Notes.org
Merge branch 'color-themes'

Conflicts:
	Notes.org
fix tramp path problem upon accessing nixos machines
Merge remote-tracking branch 'origin/master' into cfl
themes: add org-hide face to themes
tame whitespace

shows
lines-tail  - lines longer than 80 chars
trailing    - trailing whitespace
empty       - empty lines at the beginning and end of the buffer
indentation - evil leading indentation marks
              (spaces w/ tab-indent-mode, tabs w/o)

especially indentation highlighting might be too gentle
improve tango-dark-theme's highlighting in magit
remove personalized whitespace config and custom.el cleanup (coroa)
whitespace cleanup in tango*-theme
set C-x g as global keybinding for magit-status
remove global keybinding to magit-status (coroa)
Merge remote-tracking branch 'origin/master' into cfl