Add git_branch to version. Add troposphere's /version to the apache conf.

	modified:   atmosphere/version.py
	modified:   extras/apache/atmo.conf.dist