Bugfix to address [ATMO-249] - Fixed IPs are added/removed via. nova instead of neutron
Added flag 'remove_network' that is True by default, when False it will leave user network and security group intact when instances are suspended
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Bad not operator.. too much bash..
Modified atmo_init to ensure /tmp is writeable by all users before use. Added checks to run VNC on display :1
Terminating 'inactive' instances is permitted
Fix to address [ATMO-240], check for xterm rather than vnclicense
Temporarily fix static and resources.
	modified:   atmosphere/settings/__init__.py
Removed ordinal times from time component
Merge branch 'beta-ui'
Cleanup instance model
Added logic to set root password using atmo_init_full
Refactor deploy and init_files.

* Move from deploy_init_to to service.deploy scripts and a deploy_to.
* Move init_files/30 to init_files/v1. Add v2 which has legacy
* Eucalyptus functionality removed.
* Some PEP8 Compliance.

	renamed:    init_files/30/AtmoCL.jar -> init_files/v1/AtmoCL.jar
	renamed:    init_files/30/VNC-Server-5.0.4-Linux-x64.deb -> init_files/v1/VNC-Server-5.0.4-Linux-x64.deb
	renamed:    init_files/30/VNC-Server-5.0.4-Linux-x64.rpm -> init_files/v1/VNC-Server-5.0.4-Linux-x64.rpm
	renamed:    init_files/30/atmo-initer.rb -> init_files/v1/atmo-initer.rb
	renamed:    init_files/30/atmo_init_full.py -> init_files/v1/atmo_init_full.py
	renamed:    init_files/30/atmocl -> init_files/v1/atmocl
	renamed:    init_files/30/mount_volume -> init_files/v1/mount_volume
	renamed:    init_files/30/nrpe-snmp-install.sh -> init_files/v1/nrpe-snmp-install.sh
	renamed:    init_files/30/shellinaboxd-install.sh -> init_files/v1/shellinaboxd-install.sh
	renamed:    init_files/30/vnc-config.sh -> init_files/v1/vnc-config.sh
	new file:   init_files/v2/VNC-Server-5.0.4-Linux-x64.deb
	new file:   init_files/v2/VNC-Server-5.0.4-Linux-x64.rpm
	new file:   init_files/v2/atmo_init_full.py
	new file:   init_files/v2/nrpe-snmp-install.sh
	new file:   init_files/v2/shellinaboxd-install.sh
	new file:   init_files/v2/vnc-config.sh
	modified:   requirements.txt
	modified:   service/deploy.py
	modified:   service/instance.py
	modified:   service/tasks/driver.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Missing import line on api/machine_request
Adding ssh keys from metadata, add check to avoid duplicate keys
Merge to master, conflicts fixed
Various fixes to machine request API to resolve ATMO-243
Added optional Instance parameter, 'password', necessary migration, and included support for password injection into the instance via atmo-init
Bugfix: when machine_request fails, machine_request_error task also fails. Corrected logic for process_machine_request to match application logic