vim hardtime

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'master' of github.com:plastboks/vimdir

Conflicts:
	.gitmodules
	vimrc
merge conflict

Signed-off-by: Alexander Skjolden <alex@plastboks.net>