Merge pull request #219 from EDiLD/fix_quick

Fix quick
Merge pull request #220 from EDiLD/fix_quick

fixed email
Merge pull request #221 from EDiLD/fix_quick

fixed email
fixes to phylomatic_tree, #214
Merge branch 'master' of https://github.com/ropensci/taxize
started fxn for vascan search api
replaced rjson with rjsonio importFrom
no longer need collate in desc file, see klutometis/roxygen#139, removed tests for removed fxns, fixed errors after column name changes
vascan_search now works with POST requests, added tests for vascan_search
Updated tax_agg.R to convert matrix to data.frame
Merge pull request #225 from tpoisot/master

Updated tax_agg.R to convert matrix to data.frame
udpated vignette to fix error, added margins file, added citaiton info to startup message
woops, now margins file added
added examples to tax_agg for mixed taxonomic level input, and for matrix input, closes #223
fixed up phylomatic_tree a bit
removed plyr calls, attempting to speed up tnrs
some attempted changes to tnrs, post requests still not fixed
removed phylomatic_tree2 fxn doc file, closes #214
fixed to tnrs fxn, renamed ncbi sequence search fxns
commented out code in Catalogue of Life tests as the service is down