Reformatted all code to have the correct multiple of 4 spaces at each indent, and optimized the imports (or rather, pycharm did that all)
Merge remote-tracking branch 'origin/master'

Conflicts:
	AnalyzeSensitivityAnalysis.py
	ApplyTelluricCorrection.py
	CheckCCFs.py
	CoAdd.py
	CoAdd2.py
	Concatenate.py
	ConvertToExtensions.py
	Correlate.temp.py
	FindCCFSignificance.py
	FitBstar.py
	FitPrimaryGUI.py
	FitTellurics.py
	FitsUtils.py
	GetSNR.py
	ImproveWavelengthSolution.py
	ImproveWavelengthSolutionGUI.py
	LombScargle.py
	MakeCCFSignificancePlot.py
	MakeLineList.py
	MakeSensitivityPlot.py
	MakeSensitivityPlot_SN.py
	MeasureNaWidth.py
	PlotBlackbodies.py
	PlotFits.py
	PrepareForAnalyse.py
	ReCorrect.py
	RemovePrimaryStar.py
	Search.py
	Search2.py
	Search_Fast.py
	SensitivityAnalysis.py
	SensitivityAnalysis_Fast.py
	SensitivityAnalysis_TrueSN.py
	SensitivityAnalysis_xgrid.py
	Smooth.py
	TrimData.py
	ViewCompositeSpectrum.py
Reformatted all code to have the correct multiple of 4 spaces at each indent, and optimized the imports (or rather, pycharm did that all)