Merge branch 'master' of https://github.com/dejande/BNL

Conflicts:
	example/nsls2idods/savedevice.py