added vim speeddating and emacs ditaa
Merge remote-tracking branch 'bitbucket/malachi' into lizzy