Flake fixes
Merge pull request #930 from slouderm/test_login

Flake fixes
Structural update of Control Explorer based on my experience
Remove the blocker div on start of navigation
Fixed set_pxe_image_type

* When running multiple tests, the image may already have been set in
  which case the buttons failed to become active.
Merge pull request #932 from mfalesni/control_structure_update

Structural update of some Control Explorer objects
Workaround for vSphere4 refusing to power off suspended machine
Merge pull request #933 from mfalesni/bad_vsphere4

Workaround for vSphere4 refusing to power off suspended machine
Merge pull request #934 from mfalesni/blocker

Remove the blocker div on start of navigation
Merge pull request #935 from psav/set_pxe_image_fix

Fixed set_pxe_image_type
   Change version numbers
   Fix bug with mixing LooseVersions with strings
Make it possible for SMTP client to use static ports
Don't care about the version. Just do it.
Added ability for IP to be set
Merge pull request #942 from psav/mfalesni-smtp-static-port-possibility

Mfalesni smtp static port possibility
Merge pull request #941 from mfalesni/suspended-poweroff

Don't care about the version. Just do it.
Merge pull request #938 from weissjeffm/version-numbers

   Change version numbers
Automated host provisioning
Merge pull request #655 from nachandr/port_host_provisioning

Automated host provisioning
Added test_vm_discovery.py

1. Added cfme/tests/infrastructure/test_vm_discovery.py
Tests whether cfme will discover a vm change (add/delete) without being manually refreshed

2. Implemented version.pick() for the name of the 'Archive' tree element in the navigation menu (using updated key for downstream)