ENH: return data structure from scan.
Merge branch 'master' of https://github.com/NSLS-II/ophyd