Merge branch 'master' into local-svn

git-svn-id: svn+ssh://nucserver4/home/system/svn-repos/epics/trunk/pyepics@254 824ea382-f964-4c55-9d7d-6751c6273900
Merge branch 'master' of ../EpicsApps/xrmcollect
begin step scan app
begin step scan app
some improvements... simple scans executing, reading data, not writing data out yet
stepscan working better, data to stdout
add optional label to MotorCounter
doc for stepscan
added readmes to StepScan
stepscan improvements
Merge branch 'master' of github.com:pyepics/epicsapps
several improvements, included ScanFile class
Added spec_emulator to support ascan, a2scan, dscan, d2scan, mesh scans ala Spec -- works on simple test cases
Added test scripts for spec_emulator and more general purpose scanning
stepscan doc, some improvements
reorganization, minor improvements
fix typo in spec_emulator, add abort flag to stepscan
StepScan -- many improvements, scanning with MultiElement MCA + Scaler now working
stepscan: move to original position after scan
specscan: correctly add simple (untriggered) counters