Merge commit 'd0be0fb'
Add support for serving init_files over http.

This change is to attempt to address a deploy bug around SSL/TLS fetching of init_files.

	modified:   extras/apache/atmo.conf.dist
PEP8 Compliance.
	modified:   service/deploy.py
http file retrieval for deploy.

Ops requested we use http in deploy instead of https.

	modified:   atmosphere/settings/__init__.py
	modified:   atmosphere/settings/local.py.dist
	modified:   service/deploy.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar'