Add some config stuff

Signed-off-by: Heiko Thiery <hthiery@build07.sab.local>
Merge branch 'master' of https://github.com/hthiery/dotfiles

Conflicts:
	.vimrc

Signed-off-by: Heiko Thiery <hthiery@build07.sab.local>