Bunch of modifications
 - added newsbeuter stuff
 - added support for dropbox based sync
 - fixed some problems with emacsserver
 - fixed paths in gitconfig difftool
Merge branch 'master' of github.com:tomasherman/dotfiles

Conflicts:
	zsh/include/basic.zsh