Fix email workflow for the feedback endpoint.
	modified:   api/email.py
	modified:   core/email.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Provider machines should be ignored if their providers are disabled.
Add missing import 'core.models.query'
Update to ipython 2.1.
	modified:   requirements.txt
Actually Make snapshot optional.
	modified:   api/volume.py
	modified:   service/volume.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Move query out of the models directory, since it's not a model.

Refactor other references to it.

	modified:   api/serializers.py
	modified:   core/models/application.py
	renamed:    core/models/query.py -> core/query.py
Make image an optional variable when calling the VolumeList post endpoint.

	modified:   api/volume.py
add missing import
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Upgrade to castest4