Merge pull request #86 from hasimpson-usgs/fix_sqdist_renames

Fixed unicode terminal input issue, prefer channel station over comma…

geomagio/edge/EdgeFactory.py

@@ -176,7 +176,7 @@ class EdgeFactory(TimeseriesFactory):
             representing gaps.
         """
         stats = timeseries[0].stats
-        observatory = observatory or self.observatory or stats.station
+        observatory = observatory or stats.station or self.observatory
         channels = channels or self.channels
         type = type or self.type or stats.data_type
         interval = interval or self.interval or stats.data_interval

geomagio/edge/RawInputClient.py

@@ -131,7 +131,7 @@ class RawInputClient():
         the correct length.  We only expect observatory to ever be of an
         incorrect length.
         """
-        return network + observatory.ljust(5) + channel + location
+        return str(network + observatory.ljust(5) + channel + location)
 
     def forceout(self):
         """ force edge to recognize data