Added vim swap files to gitignore
Converted DiskSpaceHealthControl to be compatible with Java6
Updated DiskSpaceHealthControl to be compatible with Java6
Added git/vim orig files to gitignore.
Merge branch 'disk-space-java-6'

Conflicts:
	grails-app/health-controls/com/developerb/healthcontrol/DiskSpaceHealthControl.groovy