emacs config changes
some updates
nagios syntax for vim
Merge branch 'new_emacs'

Conflicts:
	emacs
cabal path
Merge branch 'master' of github.com:SKoschnicke/dotfiles

Conflicts:
	emacs
	zshrc