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
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
Started to add new classes of scans
Merge branch 'master' of https://github.com/NSLS-II/ophyd
Merge branch 'master' into scans