DOC: Fixed file tree
Merge pull request #6 from ericdill/spec_input

DOC: Fixed file tree
REF : proposed modifications to img_subtraction_pre
Merge pull request #9 from tacaswell/dc_fixup

REF : proposed modifications to img_subtraction_pre
Merge branch 'master' of https://github.com/NSLS-II/NSLS2 into read_binary

Conflicts:
	nsls2/core.py
REV: undo previous commit's merge -a of nsls2/core.py