peptide stuff not werking
Restructured proteins controller and model to use virtual attribute instead of passed parameter.  But, keeping backwards compatibility for calling parse_fasta_file by parameter passing intact for now.
trying to fix rake
A few things
complete the merge
fixed some file names to get rake to pass