Use branch --contains instead of describe and filter tags by checking to see if the tag is contained by  the current branch

Conflicts:
	lib/thor-scmversion/git_version.rb