Added VolumeSnapshot to API\n\nall CRUD operations available.
Bootable Volume API is almost ready.
Merging..
Left-behinds..
Serializers use request, not request.user. Bootable volumes working
Removed api-token-auth from api-docs
Restore API authentication
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Introduced a bug yesterday, bad context-passing between serializers. Project endpoint will work again
Introduced a bug today, fixing the bug I introduced yesterday
Add git_branch to version. Add troposphere's /version to the apache conf.

	modified:   atmosphere/version.py
	modified:   extras/apache/atmo.conf.dist
Merge branch 'abyssinian-nightjar'