Merge pull request #5 from vladpetyuk/master

added description of no.redundancy argument
Version bump for Bioconductor submission
add mzID to manifest


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzID@80522 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'local-hedgehog'
tentative fix for issue #6
Merge pull request #7 from lgatto/master

Sync with v0.99.2 from Bioc - fix for issue #6
Version bump
Added biocViews
substitutes import declaration with importFrom for less poluted namespace
Reformat to 80 char column and added the latest news
Reformatting to 4 space tabwith, change to importFrom in roxygen
Added unit tests using testthat
ignores vignette
Resolves conflict after Dropbox messup

Conflicts:
	DESCRIPTION
	NAMESPACE
	NEWS
	R/mzIDpsm.R
version bump
Version bump with added description
Added fallback if no peptide identifications are present
Added fallback if no scans are present
Down-bump
full support mzid 1.0 and 1.1