Added timekeeper
Merge branch 'master' of github.com:maurizi/vim

Conflicts:
	.gitmodules