Pipeline now 3-step clean.
Merge git@github.com:AaronParsons/capo
Merge git@github.com:AaronParsons/capo
Latest version of nored plotters.
Merge /usr/global/paper/capo
Two mfunc version of pspec_prep.
Merge /usr/global/paper/capo. Resolved conflicts in pspec_prep

Conflicts:
	pspec_pipeline/pspec_prep.py
All scripts from Minred Letter committed
Renamed my version of pspec_prep
Git rm on pspec_prep_jcp
Git rm pspec_prep_fg (my script)
Git rm on delay_null scripts (my scripts)
Merge /usr/global/paper/capo

Conflicts:
	pspec_pipeline/pspec_prep.py
Added my scripts back in
Batch deletions & script renames to use Aaron's in pipeline
Merge git@github.com:AaronParsons/capo

Conflicts:
	arp/scripts/fringe_rate_filter_static.py
Capo update
Latest jcp scripts committed
Ready for pull
Merge branch 'master' of git@github.com:jpober/capo