merge in Erik's comments
merge in Erik's comments

e-koch/pyspeckit,vlas-sokolov/pyspeckit,jpinedaf/pyspeckit,keflavich/pyspeckit,e-koch/pyspeckit,pyspeckit/pyspeckit,low-sky/pyspeckit,allisony/pyspeckit,pyspeckit/pyspeckit,low-sky/pyspeckit,keflavich/pyspeckit,vlas-sokolov/pyspeckit,allisony/pyspeckit,jpinedaf/pyspeckit