Reorganized x11 directory.
handle xlsx as an office document
disable marker folds
Merge branch 'master' of github.com:mpenkov/dotfiles

Conflicts:
	x11/solarized-dark.Xresources