Remove unused and unwanted accoutrements.
Tidy up .zshrc file.
Reinstate Vim files.
Add vim files.
Merge 'boxen' branch.
Delete vim directory again, in an attempt to resolve conflicts.
Reinstate vim files.