Added further casks.

Sorted Brewfile installs, and moved macvim back to Brewfile rather than
cask.