Merge branch 'experimental' of github.com:kliment/Printrun into experimental

pronsole.py

@@ -1153,14 +1153,14 @@ class pronsole(cmd.Cmd):
             import shlex
             if(settings):
                 param = self.expandcommand(self.settings.sliceoptscommand).replace("\\","\\\\").encode()
-                print "Entering skeinforge settings: ",param
+                print "Entering slicer settings: ",param
                 subprocess.call(shlex.split(param))
             else:
                 param = self.expandcommand(self.settings.slicecommand).encode()
                 print "Slicing: ",param
                 params=[i.replace("$s",l[0]).replace("$o",l[0].replace(".stl","_export.gcode").replace(".STL","_export.gcode")).encode() for i in shlex.split(param.replace("\\","\\\\").encode())]
                 subprocess.call(params)
-                print "Loading skeined file."
+                print "Loading sliced file."
                 self.do_load(l[0].replace(".stl","_export.gcode"))
         except Exception,e:
             print "Skeinforge execution failed: ",e
@@ -1176,10 +1176,10 @@ class pronsole(cmd.Cmd):
                 return glob.glob("*/")+glob.glob("*.stl")
                 
     def help_skein(self):
-        print "Creates a gcode file from an stl model using skeinforge (with tab-completion)"
+        print "Creates a gcode file from an stl model using the slicer (with tab-completion)"
         print "skein filename.stl - create gcode file"
         print "skein filename.stl view - create gcode file and view using skeiniso"
-        print "skein set - adjust skeinforge settings"
+        print "skein set - adjust slicer settings"
         
         
     def do_home(self,l):