Select the first tag with an exact match
Bug where we use a Django QuerySet instead of the elements within it.

If there is exactly one match then use that.

	modified:   service/tasks/driver.py
Herja should use the cas1 branch of caslib.
	modified:   requirements.txt
Fix deployment of init_files

Continued to add optional / to urls found in the Main App conf.
Fix to apache.conf to retrieve init_files when using troposphere

Conflicts:

	atmosphere/urls.py
	extras/apache/atmo.conf.dist
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja

Conflicts:
	core/models/machine.py
	requirements.txt
	service/tasks/driver.py
Artifacts from previous merge. PEP8 Complaince.
	modified:   core/models/machine.py
Update idrop deploy for herja.
	deleted:    init_files/v2/VNC-Server-5.1.0-Linux-x64.deb
	deleted:    init_files/v2/VNC-Server-5.1.0-Linux-x64.rpm
	modified:   init_files/v2/atmo_init_full.py
	new file:   init_files/v2/idrop.desktop
	new file:   init_files/v2/idrop.tgz
Improve idrop deploy.

	modified:   init_files/v2/atmo_init_full.py
Fix to the atmo_init_full iDrop routine
Removed a few minor bugs on atmo_init_full

Errors were mostly associated with machines that had
no Desktop included with /etc/skel/
Added Default Allocation to create_identity function so that users don't fall through cracks
Updated concurrency for the periodic queue to avoid task timeouts.
Added support for instances to 'phone home' without any metadata present
Cherry-pick-by-hand BUGFIX for time allocation creep on instances lasting longer than one month
Updated analytics
Bug in processing requests fixed
Updated vnc config and atmo_init_full.py
These changes were made between maintenance periods on arturo, and are being recorded to ensure no loss of code
Upgrade to caslib 2.0
Cherry-Picked from Abyssinian Nightjar: BUGFIX Time allocations.