Fixed a few issues in makePeptideSet
Merged changes.