Fix merge conflift

Merge branch 'ebirdtaxonomy' of https://github.com/ateucher/rebird into ebirdtaxonomy

Conflicts:
	R/ebirdtaxonomy.R
	man/ebirdtaxonomy.Rd
Merge

Merge branch 'ebirdtaxonomy' of https://github.com/ateucher/rebird into ebirdtaxonomy

Conflicts:
	man/ebirdtaxonomy.Rd