FIX: reissue FastICA improvements #2113

This is a cleanup of #2113 including all commits by@mblondel, @larsmans and myself.
Tests pass on my box but it would be good if someone could confirm this before merging.