ENH: Rebased with the upstream/master
ENH: Rebased with the upstream/master

This PR was rebased after the name change from skxray--> skbeam

CJ-Wright/scikit-beam,Nikea/scikit-xray,danielballan/scikit-xray,licode/scikit-xray,yugangzhang/scikit-beam,yugangzhang/scikit-beam,danielballan/scikit-xray,scikit-xray/scikit-xray,licode/scikit-beam,tacaswell/scikit-xray,CJ-Wright/scikit-beam,Nikea/scikit-xray,scikit-xray/scikit-xray,licode/scikit-beam,tacaswell/scikit-beam,danielballan/scikit-xray,tacaswell/scikit-xray,tacaswell/scikit-xray,tacaswell/scikit-beam,licode/scikit-xray,ericdill/scikit-xray,Nikea/scikit-xray,scikit-xray/scikit-xray,ericdill/scikit-xray,licode/scikit-xray,tacaswell/scikit-beam,CJ-Wright/scikit-beam,yugangzhang/scikit-beam,licode/scikit-beam,ericdill/scikit-xray