Fixed syntax error in motd_more, removed httplib2 code from both versions of init_files to replace with the urllib2 equivilent. Verified working on both providers
Merge branch 'atmo-273' into gunnr
Merge branch 'atmo-273' into gunnr
Changes, Fixes and Tweaks to celery

Lots of code changes to fix ATMO-293, ATMO-292, ATMO-289
Specific changes include:
  * Support for launching two queues to process image requests separately and
    with concurrency=1
  * updateTags supports Tag objects, str objects and raises exception on any
    other type (Fixes "Can't Adapt Type <Tag>" errors)
  * Periodic tasks have a 10 minute expiration period, after that period redis
    will REVOKE the task from the queue.
  * Changed redis start/stop order to avoid celery conflicts.
  * Update the Daemon scripts to incorporate changes in Celery 3.1.9 (v 10)
  * Changed Daemon script to use `basename` for SCRIPT_FILE rather than the
    symlink source name (ubuntu.celeryd).
  * Changed MSD script to remove the deployment scripts when the server is in
    Production Mode (DEBUG=False)
  * Tasks work without 'ignore_result' and passing in celery kwargs

	modified:   atmosphere/settings/__init__.py
	modified:   core/models/tag.py
	modified:   core/tasks/instance.py
	modified:   extras/init.d/atmosphere
	modified:   extras/init.d/celeryd.default
	modified:   extras/init.d/ubuntu.celerybeat
	modified:   extras/init.d/ubuntu.celeryd
	modified:   requirements.txt
	modified:   scripts/migrate_images.py
	modified:   scripts/set_permissions.sh
	modified:   service/deploy.py
	modified:   service/instance.py
	modified:   service/tasks/allocation.py
	modified:   service/tasks/driver.py
	modified:   service/tasks/machine.py
Missed a comment
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere