Merge branch 'dc_dev' of https://github.com/NSLS-II/ophyd
Merge branch 'master' of https://github.com/NSLS-II/ophyd
Merge branch 'master' of https://github.com/NSLS-II/ophyd
Merge branch 'master' of https://github.com/NSLS-II/ophyd
Updated to include controls
Added areadetector
Updates to logging
Updated gitignore to github suggestion
Updated CSX config file
MNT: decouple 23id example config from config.py.
Initial checkin of user API functions
Added updates for user api
Fixed limits to take tuple or tuple of tuples
Merge branch 'master' of https://github.com/NSLS-II/ophyd

Conflicts:
	examples/xf23id1_conf.py
Updated per PR #23
Added *.bak files
Initial checkin of scan_api files
Work in progress checkin
Rename testing conf to avoid conflicts with 23id setup.
MNT: fix for EpicsMotor status reporting (issue #20).