Merge branch 'kiyo_branch' of github.com:kiyo-masui/analysis_IM into kiyo_branch
Merge branch 'calinliv_branch' of github.com:kiyo-masui/analysis_IM into calinliv_branch
Merge branch 'kiyo_branch' of github.com:kiyo-masui/analysis_IM into kiyo_branch
Merge branch 'kiyo_branch' into calinliv_branch
Fixed plotting in psr_to_fits to not crash if all data gets discarded.
Merge branch 'calinliv_branch' of github.com:kiyo-masui/analysis_IM into calinliv_branch
added 22hr map combiner
minor conflict
Merge branch 'calinliv_branch' into eric_switzer

Conflicts:
	map/combine_maps.py
Merge branch 'kiyo_branch' into eric_switzer
made optical catalog binning code more generic
improved cube -> movie code
refactoring freq_slices; split off map_pair class
stripped unused map pair instance attributes
optical catalog binning code through pylint/pep8
freq_slices through pep8, pylint
improved MC selection function estimate, added constants file
added first pass at simulation calling code
improved plotting and simulation code
added simulation calling code and preliminary (notes) on data paths code
Merge branch 'master' into eric_switzer
 0.005335 ->  0.005355 in Pade interpolant and removing some trailing space