Added calibre to i3 config
Tiny cleanup of .emacs and .emacs.d -> more setup-files for separate
packages.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.emacs