some vim stuff and openbox
Merge branch 'master' of https://github.com/dvbuntu/.files

Conflicts:
	.vimrc

Not really any conflicts...