Random amends
random amends
Update main.ps1
Conflicts:
	main.ps1
Pushed Install-VEMnoVUM into util_vmware.psm1. This will install the 1000v VEM module (and presumably any VIB-based installer) without using VUM.
Revert "Added script from UCS community for firmware upgrades. Also added a cmdlet to set the default maintenance policy under the "housekeeping" function."

This reverts commit 0c59c5e56f7396e033ebba8d0915f0d16722039f.

Conflicts:
	main.ps1
	modules/buildout/build_ucs.psm1
	modules/utility/util_netapp.psm1
	modules/utility/util_ucs.psm1

Conflicts:
	main.ps1
Revert "Revert "Added script from UCS community for firmware upgrades. Also added a cmdlet to set the default maintenance policy under the "housekeeping" function.""

This reverts commit 5f6ef66b744d96c1ab9a2a6a817d974a1795423a.

Conflicts:
	main.ps1