some re-indenting and line breaks, no code changes
Merge branch 'bioc2014' of https://github.com/ermueller/RMassBank
Enable the manual peaklist input example in the vignette, closes #67
A small merge problem fixed