Remodifying for numpy on calipso; undo for numpy > 1.8
Final tweaks; no selection pre-FIR