Compatibility with phyloseq 1.7.20

Deprecated functions are no longer used.
update gitignore
Merge commit '26d4c11252234c5dd60b0e2559bab169a12d731e' into Holme_Moss
Merge branch 'master' into Holme_Moss

Conflicts:
	.gitignore