Remove Drupal specific stuff. Make other minor changes.
Make commandline vim use macvim binary commmandline vim, instead of gui vim