Merge branch 'uniax' into wip

Conflicts:
	cfg/uniax.cfg
	secop/core.py
	secop_psi/trinamic.py

secop/lib/asynconn.py

@@ -251,7 +251,9 @@ class AsynSerial(AsynConn):
             if not fullname.startswith(name):
                 raise ConfigError('illegal parity: %s' % parity)
             options['parity'] = name[0]
-        if 'timeout' not in options:
+        if 'timeout' in options:
+            options['timeout'] = float(self.timeout)
+        else:
             options['timeout'] = self.timeout
         try:
             self.connection = Serial(dev, **options)