Version bump for Bioconductor submission
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