Sync with latest dot_vim
Avoiding conflict with node's own .npm directory
Merge branch 'master' of github.com:dansomething/dotfiles

* 'master' of github.com:dansomething/dotfiles:
  Add find aliases, set push default to matching, machine specific config
  Move cask installs to .cask and remove unused installs from .brew