Updated vsphere_vm_vmdk_add.rb to find all scsi adapters instead of just LsiLogic adapters.  Also moved device assignment out of if statement to prevent it from being skipped in the event the disk is found before the controller.
Remove temp file generated by vim and update .gitignore to prevent it from happening again.
Fixed conflict in .gitignore
Merge branch 'kcormier-master'