nethack.alt.org config file, other minor changes (?)
Merge branch 'master' of https://github.com/joek295/dotfiles

Conflicts:
	.Xmodmap
	.Xresources
	.bash_aliases
	.bash_logout
	.bashrc
	.conkyrc
	.fvwm/.fvwm/config
	.fvwm/.fvwm/fvwm95_modules
	.fvwm/.fvwm/menu
	.fvwm/.fvwm/menudefs.hook
	.fvwm/.fvwm/modules
	.fvwm/.fvwm/system.fvwm2rc
	.profile
	.vim/autocorrect
	.vim/vimrc
	.xinitrc
	.xmonad/conky
	.xmonad/xmonad.hs