Some unimportant modifications. Committing basically just to merge
merge branch 'master' of http://github.com/gik0geck0/LinuxConfigs

Conflicts:
	.xmonad/xmonad-x86_64-linux
	.xmonad/xmonad.hi
	.xmonad/xmonad.o
	.zshrc
Unmerged zshrc, and added javacomplete for vim