Changed the scipy.pxi file in non-essential ways but since it will probably be a reference I figured it might as well look right.

9 files changed, 487 insertions, 455 deletions

diff --git a/scipy/base/convertcode.py b/scipy/base/convertcode.py
index 837d9bd7b..4040ded59 100644
--- a/scipy/base/convertcode.py
+++ b/scipy/base/convertcode.py
@@ -73,7 +73,7 @@ def changeimports(fstr, name, newname):
 
 def replaceattr(astr):
     astr = astr.replace(".typecode()",".dtypechar")
-    astr = astr.replace(".iscontiguous()",".flags['CONTIGUOUS']")
+    astr = astr.replace(".iscontiguous()",".flags.contiguous")
     astr = astr.replace(".byteswapped()",".byteswap()")
     astr = astr.replace(".itemsize()",".itemsize")
 
diff --git a/scipy/base/include/scipy/arrayobject.h b/scipy/base/include/scipy/arrayobject.h
index dd45a15c3..c2ebc71d7 100644
--- a/scipy/base/include/scipy/arrayobject.h
+++ b/scipy/base/include/scipy/arrayobject.h
@@ -817,7 +817,7 @@ typedef struct {
 				*/
 	PyObject *fields;       /* The fields dictionary for this type */
 	                        /* For statically defined descr this
-				   is always Py_NotImplemented */
+				   is always Py_None */
 
 	PyArray_ArrFuncs *f;     /* a table of functions specific for each
 				    basic data descriptor */
diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c
index 2610fe59c..481256a82 100644
--- a/scipy/base/src/arrayobject.c
+++ b/scipy/base/src/arrayobject.c
@@ -1006,7 +1006,10 @@ PyArray_RegisterDescrForType(int typenum, PyArray_Descr *descr)
 	descr->type_num = typenum;
 
 	if (descr->f == NULL) descr->f = old->f;
-	if (descr->fields == NULL) descr->fields = old->fields;
+	if (descr->fields == NULL) {
+		descr->fields = old->fields;
+		Py_XINCREF(descr->fields);
+	}
 	if (descr->subarray == NULL && old->subarray) {
 		descr->subarray = malloc(sizeof(PyArray_ArrayDescr));
 		memcpy(descr->subarray, old->subarray, 
@@ -1014,7 +1017,6 @@ PyArray_RegisterDescrForType(int typenum, PyArray_Descr *descr)
 		Py_INCREF(descr->subarray->shape);
 		Py_INCREF(descr->subarray->base);
 	}
-        Py_XINCREF(descr->fields);
         Py_XINCREF(descr->typeobj);
 
 #define _ZERO_CHECK(member) \
@@ -4219,19 +4221,12 @@ array_typechar_get(PyArrayObject *self)
 		return PyString_FromStringAndSize(&(self->descr->type), 1);
 }
 
+static PyObject *arraydescr_protocol_typestr_get(PyArray_Descr *);
+
 static PyObject *
 array_typestr_get(PyArrayObject *self)
 {
-	char basic_=self->descr->kind;
-	char endian = self->descr->byteorder;
-	
-	if (endian == '=') {
-		endian = '<';
-		if (!PyArray_IsNativeByteOrder(endian)) endian = '>';
-	}
-	
-	return PyString_FromFormat("%c%c%d", endian, basic_,
-				   self->descr->elsize);
+	return arraydescr_protocol_typestr_get(self->descr);
 }
 
 static PyObject *
@@ -7916,7 +7911,8 @@ PyArray_DescrNew(PyArray_Descr *base)
 	memcpy((char *)new+sizeof(PyObject),
 	       (char *)base+sizeof(PyObject),
 	       sizeof(PyArray_Descr)-sizeof(PyObject));
-		
+
+	if (new->fields == Py_None) new->fields = NULL;
 	Py_XINCREF(new->fields);
 	if (new->subarray) {
 		new->subarray = malloc(sizeof(PyArray_ArrayDescr));
@@ -7945,6 +7941,10 @@ arraydescr_dealloc(PyArray_Descr *self)
 	self->ob_type->tp_free(self);
 }
 
+/* we need to be careful about setting attributes because these
+   objects are pointed to by arrays that depend on them for interpreting
+   data.  Currently no attributes of dtypedescr objects can be set. 
+*/
 static PyMemberDef arraydescr_members[] = {
 	{"dtype", T_OBJECT, offsetof(PyArray_Descr, typeobj), RO, NULL},
 	{"dtypekind", T_CHAR, offsetof(PyArray_Descr, kind), RO, NULL},
@@ -7988,7 +7988,7 @@ arraydescr_protocol_descr_get(PyArray_Descr *self)
 	PyObject *dobj, *res;
 	static PyObject *module=NULL;
 
-	if (self->fields == NULL) {
+	if (self->fields == NULL || self->fields == Py_None) {
 		/* get default */
 		dobj = PyTuple_New(2);
 		if (dobj == NULL) return NULL;
@@ -8009,6 +8009,20 @@ arraydescr_protocol_descr_get(PyArray_Descr *self)
         return PyObject_CallMethod(module, "_array_descr", "O", self);
 }
 
+/* returns 1 for a builtin type
+   and 2 for a user-defined data-type descriptor
+   return 0 if neither (i.e. it's a copy of one)
+*/
+static PyObject *
+arraydescr_isbuiltin_get(PyArray_Descr *self) 
+{
+	long val;
+	val = 0;
+	if (self->fields == Py_None) val = 1;
+	if (PyTypeNum_ISUSERDEF(self->type_num)) val = 2;
+	return PyInt_FromLong(val);
+}
+
 static PyGetSetDef arraydescr_getsets[] = {
 	{"subdescr", 
 	 (getter)arraydescr_subdescr_get,
@@ -8018,14 +8032,17 @@ static PyGetSetDef arraydescr_getsets[] = {
 	 (getter)arraydescr_protocol_descr_get,
 	 NULL,
 	 "The array_protocol type descriptor."},
-	{"arrtypestr",
+	{"dtypestr",
 	 (getter)arraydescr_protocol_typestr_get,
 	 NULL,
 	 "The array_protocol typestring."},
+	{"isbuiltin",
+	 (getter)arraydescr_isbuiltin_get,
+	 NULL,
+	 "Is this a buillt-in data-type descriptor."},
 	{NULL, NULL, NULL, NULL},
 };
 
-
 static PyArray_Descr *_convert_from_list(PyObject *obj, int align);
 static PyArray_Descr *_convert_from_dict(PyObject *obj, int align);
 
@@ -8035,8 +8052,10 @@ arraydescr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
 	PyObject *odescr;
 	PyArray_Descr *descr, *conv;
 	int align=0;
+	Bool copy=FALSE;
 	
-	if (!PyArg_ParseTuple(args, "O|i", &odescr, &align))
+	if (!PyArg_ParseTuple(args, "O|iO&", &odescr, &align,
+			      PyArray_BoolConverter, &copy))
 		return NULL;
 	
 	if (align) {
@@ -8047,10 +8066,13 @@ arraydescr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
 	}
 	if (!PyArray_DescrConverter(odescr, &conv)) 
 		return NULL;
-	/* Get a new copy of it (so it can be changed in setstate) */
-	descr = PyArray_DescrNew(conv);
-	Py_DECREF(conv);
-	return (PyObject *)descr;
+	/* Get a new copy of it (e.g. so it can be changed in setstate) */
+	if (copy && conv->fields == Py_None) {
+		descr = PyArray_DescrNew(conv);
+		Py_DECREF(conv);
+		conv = descr;
+	}
+	return (PyObject *)conv;
 }
 
 static char doc_arraydescr_reduce[] = "self.__reduce__()  for pickling.";
@@ -8081,8 +8103,8 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *args)
 	else {
 		obj = PyString_FromFormat("%c%d",self->kind, self->elsize);
 	}
-	PyTuple_SET_ITEM(ret, 1, Py_BuildValue("(N)", obj));
-
+	PyTuple_SET_ITEM(ret, 1, Py_BuildValue("(Nii)", obj, 0, 1));
+	
 	/* Now return the state which is at least 
 	   byteorder, subarray, and fields */
 	endian = self->byteorder;
@@ -8093,7 +8115,7 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *args)
 	state = PyTuple_New(5);
 	PyTuple_SET_ITEM(state, 0, PyString_FromFormat("%c", endian));
 	PyTuple_SET_ITEM(state, 1, arraydescr_subdescr_get(self));
-	if (self->fields) {
+	if (self->fields && self->fields != Py_None) {
 		Py_INCREF(self->fields);
 		PyTuple_SET_ITEM(state, 2, self->fields);
 	}
@@ -8130,6 +8152,8 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
 	char endian;
 	PyObject *subarray, *fields;
 
+	if (self->fields == Py_None) {Py_INCREF(Py_None); return Py_None;}
+
 	if (!PyArg_ParseTuple(args, "(cOOii)", &endian, &subarray, &fields,
 			      &elsize, &alignment)) return NULL;
 	
@@ -8150,7 +8174,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
 		self->subarray->shape = PyTuple_GET_ITEM(subarray, 1);
 		Py_INCREF(self->subarray->shape);
 	}
-
+	
 	if (fields != Py_None) {
 		Py_XDECREF(self->fields);
 		self->fields = fields;
@@ -8161,6 +8185,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
 		self->elsize = elsize;
 		self->alignment = alignment;
 	}
+	
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/scipy/base/src/arraytypes.inc.src b/scipy/base/src/arraytypes.inc.src
index 54976db9b..862c8ed3b 100644
--- a/scipy/base/src/arraytypes.inc.src
+++ b/scipy/base/src/arraytypes.inc.src
@@ -292,7 +292,7 @@ VOID_getitem(char *ip, PyArrayObject *ap)
 				      "_getitem");
 	descr = ap->descr;
 	PyErr_Clear();
-	if (!meth && descr->fields) {
+	if (!meth && descr->fields && descr->fields != Py_None) {
 		PyObject *key;
 		PyObject *names;
 		int i, n;
@@ -373,7 +373,8 @@ VOID_setitem(PyObject *op, char *ip, PyArrayObject *ap)
 				      "_setitem");
 	descr = ap->descr;
 	PyErr_Clear();
-	if (!meth && descr->fields && PyTuple_Check(op)) {
+	if (!meth && descr->fields && (descr->fields != Py_None) && \
+	    PyTuple_Check(op)) {
 		PyObject *key;
 		PyObject *names;
 		int i, n, ret=-1;
@@ -1669,7 +1670,7 @@ static PyArray_Descr @from@_Descr = {
 	PyArray_@from@, 0,
 	_ALIGN(@align@),
 	NULL,
-	NULL,
+	Py_None,
 	&_Py@NAME@_ArrFuncs,
 };
 
@@ -1732,7 +1733,7 @@ static PyArray_Descr @from@_Descr = {
 	@num@*sizeof(@fromtyp@), 
 	_ALIGN(@fromtyp@),
 	NULL,
-	NULL,
+	Py_None,
 	&_Py@NAME@_ArrFuncs,
 };
 
diff --git a/scipy/base/src/multiarraymodule.c b/scipy/base/src/multiarraymodule.c
index cd51e466b..f385ba527 100644
--- a/scipy/base/src/multiarraymodule.c
+++ b/scipy/base/src/multiarraymodule.c
@@ -29,7 +29,6 @@
 static PyObject *typeDict=NULL;   /* Must be explicitly loaded */
 
 
-
 static PyArray_Descr *
 _arraydescr_fromobj(PyObject *obj)
 {
@@ -2926,8 +2925,10 @@ _use_inherit(PyArray_Descr *type, PyObject *newobj, int *errflag)
 		return NULL;
 	}
 	new->elsize = conv->elsize;
-	new->fields = conv->fields;
-	Py_XINCREF(new->fields);
+	if (conv->fields != Py_None) {
+		new->fields = conv->fields;
+		Py_XINCREF(new->fields);
+	}
 	Py_DECREF(conv);
 	*errflag = 0;
 	return new;
@@ -3290,6 +3291,8 @@ PyArray_DescrConverter(PyObject *obj, PyArray_Descr **at)
 		check_num = PyArray_OBJECT;
 		if (obj == (PyObject *)(&PyInt_Type))
 			check_num = PyArray_LONG;
+		else if (obj == (PyObject *)(&PyLong_Type))
+			check_num = PyArray_LONGLONG;
 		else if (obj == (PyObject *)(&PyFloat_Type)) 
 			check_num = PyArray_DOUBLE;
 		else if (obj == (PyObject *)(&PyComplex_Type)) 
diff --git a/scipy/base/src/scalartypes.inc.src b/scipy/base/src/scalartypes.inc.src
index b095a859f..c9b9901a1 100644
--- a/scipy/base/src/scalartypes.inc.src
+++ b/scipy/base/src/scalartypes.inc.src
@@ -1949,7 +1949,8 @@ PyArray_DescrFromScalar(PyObject *sc)
 			descr->elsize =					\
 				((PyVoidScalarObject *)sc)->ob_size;
 			descr->fields = PyObject_GetAttrString(sc, "fields");
-			if (!descr->fields || !PyDict_Check(descr->fields)) {
+			if (!descr->fields || !PyDict_Check(descr->fields) || \
+			    (descr->fields == Py_None)) {
 				Py_XDECREF(descr->fields);
 				descr->fields = NULL;
 			}
diff --git a/scipy/corelib/mtrand/mtrand.c b/scipy/corelib/mtrand/mtrand.c
index 013333982..0e9b9a946 100644
--- a/scipy/corelib/mtrand/mtrand.c
+++ b/scipy/corelib/mtrand/mtrand.c
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.3.2a on Fri Nov 11 03:11:36 2005 */
+/* Generated by Pyrex 0.9.3.1 on Tue Dec 13 13:42:15 2005 */
 
 #include "Python.h"
 #include "structmember.h"
@@ -42,7 +42,8 @@ struct __pyx_obj_6mtrand_RandomState {
   rk_state (*internal_state);
 };
 
-static PyTypeObject *__pyx_ptype_6mtrand_ArrayType = 0;
+static PyTypeObject *__pyx_ptype_6mtrand_dtypedescr = 0;
+static PyTypeObject *__pyx_ptype_6mtrand_ndarray = 0;
 static PyTypeObject *__pyx_ptype_6mtrand_RandomState = 0;
 static PyObject *__pyx_k2;
 static PyObject *__pyx_k3;
@@ -180,11 +181,11 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":128 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":128 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":129 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":129 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -193,7 +194,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":131 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":131 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -213,20 +214,20 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":132 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":132 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":133 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":133 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":134 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":134 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":135 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":135 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":136 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":136 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -260,11 +261,11 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":144 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":144 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":145 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":145 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -273,7 +274,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":147 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":147 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -293,20 +294,20 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":148 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":148 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":149 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":149 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":150 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":150 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":151 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":151 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":152 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":152 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -340,11 +341,11 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":161 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":161 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":162 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":162 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -353,7 +354,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":164 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":164 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -373,20 +374,20 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":165 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":165 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":166 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":166 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":167 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":167 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":168 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":168 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":169 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":169 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -420,11 +421,11 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":179 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":179 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":180 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":180 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -433,7 +434,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":182 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":182 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -453,20 +454,20 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":183 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":183 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":184 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":184 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":185 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":185 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":186 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":186 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":187 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":187 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -502,11 +503,11 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":195 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":195 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":196 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":196 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -515,7 +516,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":198 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":198 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -535,20 +536,20 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":199 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":199 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":200 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":200 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":201 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":201 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":202 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":202 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":203 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":203 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -582,11 +583,11 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":211 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":211 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":212 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":212 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -595,7 +596,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":214 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":214 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -615,20 +616,20 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":215 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":215 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":216 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":216 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":217 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":217 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":218 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":218 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":219 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":219 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -662,11 +663,11 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":228 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":228 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":229 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":229 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -675,7 +676,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":231 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":231 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -695,20 +696,20 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":232 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":232 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":233 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":233 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":234 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":234 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":235 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":235 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":236 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":236 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -742,11 +743,11 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":244 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":244 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":245 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":245 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -755,7 +756,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":247 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":247 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -775,20 +776,20 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":248 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":248 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":249 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":249 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":250 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":250 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":251 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":251 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":252 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":252 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -817,29 +818,29 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) {
   long __pyx_v_i;
   double __pyx_r;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":257 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":257 */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":258 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":258 */
   __pyx_v_c = 0.0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":259 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":259 */
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":260 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":260 */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":261 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":261 */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":262 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":262 */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":263 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":263 */
     __pyx_v_sum = __pyx_v_t;
   }
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":264 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":264 */
   __pyx_r = __pyx_v_sum;
   goto __pyx_L0;
 
@@ -863,10 +864,10 @@ static int __pyx_f_6mtrand_11RandomState___init__(PyObject *__pyx_v_self, PyObje
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":287 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":287 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state ))));
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":289 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":289 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
@@ -895,11 +896,11 @@ static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self) {
   int __pyx_1;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":292 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":292 */
   __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":293 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":293 */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
@@ -933,11 +934,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_seed);
   arrayObject_obj = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_obj);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":307 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":307 */
   __pyx_1 = __pyx_v_seed == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":308 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":308 */
     __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
@@ -954,21 +955,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":310 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":310 */
     __pyx_5 = PyLong_AsUnsignedLong(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; goto __pyx_L1;}
     rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":312 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":312 */
     __pyx_3 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_seed,PyArray_LONG,1,1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; goto __pyx_L1;}
     Py_INCREF(((PyObject *)__pyx_3));
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":313 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":313 */
     init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
   }
   __pyx_L2:;
@@ -1005,7 +1006,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   arrayObject_state = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_state);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":322 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":322 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1026,10 +1027,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self,
   arrayObject_state = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":323 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":323 */
   memcpy(((void (*))arrayObject_state->data),((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long ))));
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":324 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":324 */
   __pyx_4 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;}
   Py_INCREF(__pyx_n_MT19937);
@@ -1086,7 +1087,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   __pyx_v_algorithm_name = Py_None; Py_INCREF(__pyx_v_algorithm_name);
   __pyx_v_key = Py_None; Py_INCREF(__pyx_v_key);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":335 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":335 */
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1094,12 +1095,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   __pyx_v_algorithm_name = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":336 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":336 */
   if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;}
   __pyx_3 = __pyx_3 != 0;
   if (__pyx_3) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":337 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":337 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
     Py_INCREF(__pyx_k62p);
@@ -1114,7 +1115,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":338 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":338 */
   __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
   __pyx_2 = __Pyx_UnpackItem(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
   Py_DECREF(__pyx_v_key);
@@ -1127,18 +1128,18 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   if (__Pyx_EndUnpack(__pyx_1, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":339 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":339 */
   __pyx_4 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_key,PyArray_LONG,1,1)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 339; goto __pyx_L1;}
   Py_INCREF(((PyObject *)__pyx_4));
   Py_DECREF(((PyObject *)arrayObject_obj));
   arrayObject_obj = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":340 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":340 */
   __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_3) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":341 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":341 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; goto __pyx_L1;}
     Py_INCREF(__pyx_k63p);
@@ -1153,10 +1154,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   }
   __pyx_L3:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":342 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":342 */
   memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,((void (*))arrayObject_obj->data),(624 * (sizeof(long ))));
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":343 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":343 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
   __pyx_r = Py_None; Py_INCREF(__pyx_r);
@@ -1186,7 +1187,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":347 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":347 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;}
   __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;}
@@ -1221,7 +1222,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___setstate__(PyObject *__pyx_v_se
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_state);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":350 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":350 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; goto __pyx_L1;}
   Py_INCREF(__pyx_v_state);
@@ -1260,7 +1261,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":353 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":353 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1310,7 +1311,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_sample(PyObject *__pyx_v_s
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":361 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":361 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -1340,7 +1341,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":368 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":368 */
   __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -1391,38 +1392,38 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_size);
   arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":383 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":383 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":384 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":384 */
     __pyx_v_lo = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":385 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":385 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":387 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":387 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; goto __pyx_L1;}
     __pyx_v_lo = __pyx_2;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":388 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":388 */
     __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":390 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":390 */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":391 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":391 */
   __pyx_1 = (__pyx_v_diff < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":392 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":392 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;}
     Py_INCREF(__pyx_k64p);
@@ -1437,11 +1438,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   }
   __pyx_L3:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":394 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":394 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":395 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":395 */
     __pyx_3 = PyLong_FromUnsignedLong(rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; goto __pyx_L1;}
     __pyx_r = __pyx_3;
     __pyx_3 = 0;
@@ -1450,7 +1451,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":397 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":397 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -1470,20 +1471,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":398 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":398 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":399 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":399 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":400 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":400 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":401 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":401 */
       (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
     }
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":402 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":402 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1520,22 +1521,22 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO
   Py_INCREF(__pyx_v_self);
   __pyx_v_bytestring = Py_None; Py_INCREF(__pyx_v_bytestring);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":410 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":410 */
   __pyx_v_bytes = PyMem_Malloc(__pyx_v_length);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":411 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":411 */
   rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":412 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":412 */
   __pyx_1 = PyString_FromString(((char (*))__pyx_v_bytes)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 412; goto __pyx_L1;}
   Py_DECREF(__pyx_v_bytestring);
   __pyx_v_bytestring = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":413 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":413 */
   PyMem_Free(__pyx_v_bytes);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":414 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":414 */
   Py_INCREF(__pyx_v_bytestring);
   __pyx_r = __pyx_v_bytestring;
   goto __pyx_L0;
@@ -1568,7 +1569,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":421 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":421 */
   __pyx_1 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_low,(__pyx_v_high - __pyx_v_low)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -1610,7 +1611,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":430 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":430 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
@@ -1625,7 +1626,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":431 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":431 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;}
     __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;}
@@ -1638,7 +1639,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":433 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":433 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;}
     __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;}
@@ -1689,7 +1690,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":441 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":441 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
@@ -1704,7 +1705,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":442 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":442 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;}
     __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;}
@@ -1717,7 +1718,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":444 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":444 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; goto __pyx_L1;}
     Py_INCREF(__pyx_v_args);
@@ -1767,16 +1768,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":453 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":453 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":454 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":454 */
     Py_INCREF(__pyx_v_low);
     Py_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":455 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":455 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; goto __pyx_L1;}
     Py_DECREF(__pyx_v_low);
     __pyx_v_low = __pyx_2;
@@ -1785,7 +1786,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":456 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":456 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;}
   __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;}
@@ -1832,7 +1833,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_normal(PyObject *__pyx_v
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":464 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":464 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 464; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -1873,11 +1874,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":471 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":471 */
   __pyx_1 = (__pyx_v_scale <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":472 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":472 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; goto __pyx_L1;}
     Py_INCREF(__pyx_k66p);
@@ -1892,7 +1893,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":473 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":473 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 473; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -1935,11 +1936,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":480 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":480 */
   __pyx_1 = (__pyx_v_a <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":481 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":481 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; goto __pyx_L1;}
     Py_INCREF(__pyx_k67p);
@@ -1955,7 +1956,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   __pyx_1 = (__pyx_v_b <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":483 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":483 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; goto __pyx_L1;}
     Py_INCREF(__pyx_k68p);
@@ -1970,7 +1971,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":484 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":484 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_a,__pyx_v_b); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2011,11 +2012,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":491 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":491 */
   __pyx_1 = (__pyx_v_scale <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":492 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":492 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;}
     Py_INCREF(__pyx_k69p);
@@ -2030,7 +2031,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":493 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":493 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2062,7 +2063,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":500 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":500 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2100,11 +2101,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":507 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":507 */
   __pyx_1 = (__pyx_v_shape <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":508 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":508 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; goto __pyx_L1;}
     Py_INCREF(__pyx_k70p);
@@ -2119,7 +2120,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":509 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":509 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2163,11 +2164,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":516 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":516 */
   __pyx_1 = (__pyx_v_shape <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":517 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":517 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; goto __pyx_L1;}
     Py_INCREF(__pyx_k71p);
@@ -2183,7 +2184,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   __pyx_1 = (__pyx_v_scale <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":519 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":519 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; goto __pyx_L1;}
     Py_INCREF(__pyx_k72p);
@@ -2198,7 +2199,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":520 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":520 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_shape,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 520; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2241,11 +2242,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":527 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":527 */
   __pyx_1 = (__pyx_v_dfnum <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":528 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":528 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
     Py_INCREF(__pyx_k73p);
@@ -2261,7 +2262,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   __pyx_1 = (__pyx_v_dfden <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":530 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":530 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;}
     Py_INCREF(__pyx_k74p);
@@ -2276,7 +2277,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":531 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":531 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_dfnum,__pyx_v_dfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2322,11 +2323,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":538 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":538 */
   __pyx_1 = (__pyx_v_dfnum <= 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":539 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":539 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;}
     Py_INCREF(__pyx_k75p);
@@ -2342,7 +2343,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_1 = (__pyx_v_dfden <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":541 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":541 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
     Py_INCREF(__pyx_k76p);
@@ -2358,7 +2359,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_1 = (__pyx_v_nonc < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":543 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":543 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;}
     Py_INCREF(__pyx_k77p);
@@ -2373,7 +2374,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":544 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":544 */
   __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_dfnum,__pyx_v_dfden,__pyx_v_nonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2413,11 +2414,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":552 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":552 */
   __pyx_1 = (__pyx_v_df <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":553 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":553 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; goto __pyx_L1;}
     Py_INCREF(__pyx_k78p);
@@ -2432,7 +2433,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":554 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":554 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_df); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 554; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2475,11 +2476,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":561 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":561 */
   __pyx_1 = (__pyx_v_df <= 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":562 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":562 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; goto __pyx_L1;}
     Py_INCREF(__pyx_k79p);
@@ -2495,7 +2496,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   __pyx_1 = (__pyx_v_nonc < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":564 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":564 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;}
     Py_INCREF(__pyx_k80p);
@@ -2510,7 +2511,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":565 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":565 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_df,__pyx_v_nonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2542,7 +2543,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":573 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":573 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 573; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2580,11 +2581,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":580 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":580 */
   __pyx_1 = (__pyx_v_df <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":581 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":581 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; goto __pyx_L1;}
     Py_INCREF(__pyx_k81p);
@@ -2599,7 +2600,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":582 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":582 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_df); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2640,11 +2641,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":590 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":590 */
   __pyx_1 = (__pyx_v_kappa < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":591 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":591 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; goto __pyx_L1;}
     Py_INCREF(__pyx_k82p);
@@ -2659,7 +2660,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":592 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":592 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_mu,__pyx_v_kappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2699,11 +2700,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":599 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":599 */
   __pyx_1 = (__pyx_v_a <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":600 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":600 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;}
     Py_INCREF(__pyx_k83p);
@@ -2718,7 +2719,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":601 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":601 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2758,11 +2759,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":608 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":608 */
   __pyx_1 = (__pyx_v_a <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":609 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":609 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; goto __pyx_L1;}
     Py_INCREF(__pyx_k84p);
@@ -2777,7 +2778,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":610 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":610 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2817,11 +2818,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":617 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":617 */
   __pyx_1 = (__pyx_v_a <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":618 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":618 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
     Py_INCREF(__pyx_k85p);
@@ -2836,7 +2837,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":619 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":619 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 619; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2879,11 +2880,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":626 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":626 */
   __pyx_1 = (__pyx_v_scale <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":627 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":627 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; goto __pyx_L1;}
     Py_INCREF(__pyx_k86p);
@@ -2898,7 +2899,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":628 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":628 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 628; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2941,11 +2942,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":635 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":635 */
   __pyx_1 = (__pyx_v_scale <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":636 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":636 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
     Py_INCREF(__pyx_k87p);
@@ -2960,7 +2961,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":637 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":637 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3003,11 +3004,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":644 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":644 */
   __pyx_1 = (__pyx_v_scale <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":645 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":645 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; goto __pyx_L1;}
     Py_INCREF(__pyx_k88p);
@@ -3022,7 +3023,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":646 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":646 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3065,11 +3066,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":658 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":658 */
   __pyx_1 = (__pyx_v_sigma <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":659 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":659 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
     Py_INCREF(__pyx_k89p);
@@ -3084,7 +3085,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":660 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":660 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_mean,__pyx_v_sigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3125,11 +3126,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":667 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":667 */
   __pyx_1 = (__pyx_v_scale <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":668 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":668 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 668; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 668; goto __pyx_L1;}
     Py_INCREF(__pyx_k90p);
@@ -3144,7 +3145,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":669 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":669 */
   __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3187,11 +3188,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":676 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":676 */
   __pyx_1 = (__pyx_v_mean <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":677 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":677 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;}
     Py_INCREF(__pyx_k91p);
@@ -3207,7 +3208,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   __pyx_1 = (__pyx_v_scale <= 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":679 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":679 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 679; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 679; goto __pyx_L1;}
     Py_INCREF(__pyx_k92p);
@@ -3222,7 +3223,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":680 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":680 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_mean,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 680; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3268,11 +3269,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":688 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":688 */
   __pyx_1 = (__pyx_v_left > __pyx_v_mode);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":689 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":689 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;}
     Py_INCREF(__pyx_k93p);
@@ -3288,7 +3289,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_1 = (__pyx_v_mode > __pyx_v_right);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":691 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":691 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 691; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 691; goto __pyx_L1;}
     Py_INCREF(__pyx_k94p);
@@ -3304,7 +3305,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_1 = (__pyx_v_left == __pyx_v_right);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":693 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":693 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; goto __pyx_L1;}
     Py_INCREF(__pyx_k95p);
@@ -3319,7 +3320,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":694 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":694 */
   __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_left,__pyx_v_mode,__pyx_v_right); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 694; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3364,11 +3365,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":703 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":703 */
   __pyx_1 = (__pyx_v_n <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":704 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":704 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;}
     Py_INCREF(__pyx_k96p);
@@ -3384,7 +3385,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_1 = (__pyx_v_p < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":706 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":706 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; goto __pyx_L1;}
     Py_INCREF(__pyx_k97p);
@@ -3400,7 +3401,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_1 = (__pyx_v_p > 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":708 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":708 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;}
     Py_INCREF(__pyx_k98p);
@@ -3415,7 +3416,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":709 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":709 */
   __pyx_2 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_n,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3460,11 +3461,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":716 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":716 */
   __pyx_1 = (__pyx_v_n <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":717 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":717 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;}
     Py_INCREF(__pyx_k99p);
@@ -3480,7 +3481,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_1 = (__pyx_v_p < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":719 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":719 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;}
     Py_INCREF(__pyx_k100p);
@@ -3496,7 +3497,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_1 = (__pyx_v_p > 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":721 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":721 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 721; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 721; goto __pyx_L1;}
     Py_INCREF(__pyx_k101p);
@@ -3511,7 +3512,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":722 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":722 */
   __pyx_2 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_n,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 722; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3552,11 +3553,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":730 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":730 */
   __pyx_1 = (__pyx_v_lam <= 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":731 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":731 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
     Py_INCREF(__pyx_k102p);
@@ -3571,7 +3572,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":732 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":732 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_lam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3611,11 +3612,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":739 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":739 */
   __pyx_1 = (__pyx_v_a <= 1.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":740 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":740 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
     Py_INCREF(__pyx_k103p);
@@ -3630,7 +3631,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":741 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":741 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3672,11 +3673,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":749 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":749 */
   __pyx_1 = (__pyx_v_p < 0.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":750 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":750 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;}
     Py_INCREF(__pyx_k104p);
@@ -3692,7 +3693,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   __pyx_1 = (__pyx_v_p > 1.0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":752 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":752 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; goto __pyx_L1;}
     Py_INCREF(__pyx_k105p);
@@ -3707,7 +3708,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":753 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":753 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 753; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3755,11 +3756,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":765 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":765 */
   __pyx_1 = (__pyx_v_ngood < 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":766 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":766 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;}
     Py_INCREF(__pyx_k106p);
@@ -3775,7 +3776,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = (__pyx_v_nbad < 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":768 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":768 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; goto __pyx_L1;}
     Py_INCREF(__pyx_k107p);
@@ -3791,7 +3792,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = ((__pyx_v_ngood + __pyx_v_nbad) < __pyx_v_nsample);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":770 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":770 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; goto __pyx_L1;}
     Py_INCREF(__pyx_k108p);
@@ -3807,7 +3808,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = (__pyx_v_nsample < 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":772 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":772 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;}
     Py_INCREF(__pyx_k109p);
@@ -3822,7 +3823,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":773 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":773 */
   __pyx_2 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ngood,__pyx_v_nbad,__pyx_v_nsample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3864,11 +3865,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":781 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":781 */
   __pyx_1 = (__pyx_v_p < 0);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":782 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":782 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 782; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 782; goto __pyx_L1;}
     Py_INCREF(__pyx_k110p);
@@ -3884,7 +3885,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   __pyx_1 = (__pyx_v_p > 1);
   if (__pyx_1) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":784 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":784 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; goto __pyx_L1;}
     Py_INCREF(__pyx_k111p);
@@ -3899,7 +3900,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":785 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":785 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3974,7 +3975,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_s = Py_None; Py_INCREF(__pyx_v_s);
   __pyx_v_v = Py_None; Py_INCREF(__pyx_v_v);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":806 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":806 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3988,7 +3989,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_mean = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":807 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":807 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4002,11 +4003,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_cov = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":808 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":808 */
   __pyx_4 = __pyx_v_size == Py_None;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":809 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":809 */
     __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;}
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_1;
@@ -4015,14 +4016,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":811 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":811 */
     Py_INCREF(__pyx_v_size);
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_v_size;
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":812 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":812 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;}
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;}
@@ -4038,7 +4039,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":813 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":813 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;}
     Py_INCREF(__pyx_k112p);
@@ -4053,7 +4054,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   __pyx_L3:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":814 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":814 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
@@ -4085,7 +4086,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":815 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":815 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;}
     Py_INCREF(__pyx_k113p);
@@ -4100,7 +4101,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   __pyx_L4:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":816 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":816 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
@@ -4117,7 +4118,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":817 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":817 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;}
     Py_INCREF(__pyx_k114p);
@@ -4132,7 +4133,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   __pyx_L5:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":819 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":819 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;}
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;}
@@ -4147,7 +4148,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":820 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":820 */
     __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;}
     Py_INCREF(__pyx_v_shape);
     PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
@@ -4158,7 +4159,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   __pyx_L6:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":821 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":821 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;}
   __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;}
@@ -4171,7 +4172,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_final_shape = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":822 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":822 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;}
@@ -4186,7 +4187,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":826 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":826 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
@@ -4209,7 +4210,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_x = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":827 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":827 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -4248,7 +4249,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":837 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":837 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_linalg); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4275,7 +4276,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   if (__Pyx_EndUnpack(__pyx_2, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":838 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":838 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_matrixmultiply); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -4302,7 +4303,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_x = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":841 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":841 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4318,7 +4319,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":842 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":842 */
   __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
@@ -4329,7 +4330,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":843 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":843 */
   Py_INCREF(__pyx_v_x);
   __pyx_r = __pyx_v_x;
   goto __pyx_L0;
@@ -4397,7 +4398,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape);
   __pyx_v_multin = Py_None; Py_INCREF(__pyx_v_multin);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":861 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":861 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   Py_INCREF(__pyx_v_pvals);
@@ -4409,21 +4410,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_v_d = __pyx_4;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":862 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":862 */
   __pyx_1 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_pvals,PyArray_DOUBLE,1,1)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
   Py_INCREF(((PyObject *)__pyx_1));
   Py_DECREF(((PyObject *)arrayObject_parr));
   arrayObject_parr = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":863 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":863 */
   __pyx_v_pix = ((double (*))arrayObject_parr->data);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":865 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":865 */
   __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > 1.0);
   if (__pyx_5) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":866 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":866 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; goto __pyx_L1;}
     Py_INCREF(__pyx_k115p);
@@ -4438,11 +4439,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":868 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":868 */
   __pyx_5 = __pyx_v_size == Py_None;
   if (__pyx_5) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":869 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":869 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
@@ -4465,7 +4466,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":871 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":871 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
     Py_INCREF(__pyx_v_size);
@@ -4479,7 +4480,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":873 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":873 */
     __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
@@ -4492,7 +4493,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   }
   __pyx_L3:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":875 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":875 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4511,68 +4512,68 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   __pyx_v_multin = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":876 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":876 */
   Py_INCREF(((PyObject *)__pyx_v_multin));
   Py_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":877 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":877 */
   __pyx_v_mnix = ((long (*))arrayObject_mnarr->data);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":878 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":878 */
   __pyx_v_i = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":879 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":879 */
   while (1) {
     __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_5) break;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":880 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":880 */
     __pyx_v_Sum = 1.0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":881 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":881 */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":882 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":882 */
     __pyx_4 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":883 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":883 */
       (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,__pyx_v_dn,((__pyx_v_pix[__pyx_v_j]) / __pyx_v_Sum));
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":884 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":884 */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":885 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":885 */
       __pyx_5 = (__pyx_v_dn <= 0);
       if (__pyx_5) {
 
-        /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":886 */
+        /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":886 */
         goto __pyx_L7;
         goto __pyx_L8;
       }
       __pyx_L8:;
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":887 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":887 */
       __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j]));
     }
     __pyx_L7:;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":888 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":888 */
     __pyx_5 = (__pyx_v_dn > 0);
     if (__pyx_5) {
 
-      /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":889 */
+      /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":889 */
       (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn;
       goto __pyx_L9;
     }
     __pyx_L9:;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":891 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":891 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":893 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":893 */
   Py_INCREF(__pyx_v_multin);
   __pyx_r = __pyx_v_multin;
   goto __pyx_L0;
@@ -4613,7 +4614,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":904 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":904 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
@@ -4629,15 +4630,15 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_v_i = __pyx_4;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":905 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":905 */
   while (1) {
     __pyx_5 = (__pyx_v_i > 0);
     if (!__pyx_5) break;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":906 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":906 */
     __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":907 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":907 */
     __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 907; goto __pyx_L1;}
     __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 907; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -4653,7 +4654,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":908 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":908 */
     __pyx_v_i = (__pyx_v_i - 1);
   }
 
@@ -4689,7 +4690,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   Py_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; Py_INCREF(__pyx_v_arr);
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":916 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":916 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
@@ -4703,7 +4704,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":917 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":917 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4720,7 +4721,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   }
   /*else*/ {
 
-    /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":919 */
+    /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":919 */
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; goto __pyx_L1;}
     __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -4736,7 +4737,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   }
   __pyx_L2:;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":920 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":920 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr);
@@ -4746,7 +4747,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":921 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":921 */
   Py_INCREF(__pyx_v_arr);
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
@@ -5113,515 +5114,516 @@ DL_EXPORT(void) initmtrand(void) {
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;};
-  __pyx_ptype_6mtrand_ArrayType = __Pyx_ImportType("scipy", "ArrayType", sizeof(PyArrayObject)); if (!__pyx_ptype_6mtrand_ArrayType) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 36; goto __pyx_L1;}
+  __pyx_ptype_6mtrand_dtypedescr = __Pyx_ImportType("scipy", "dtypedescr", sizeof(PyArray_Descr)); if (!__pyx_ptype_6mtrand_dtypedescr) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; goto __pyx_L1;}
+  __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("scipy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_6mtrand_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 36; goto __pyx_L1;}
   if (PyType_Ready(&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; goto __pyx_L1;}
   if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; goto __pyx_L1;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":118 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":118 */
   import_array();
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":120 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":120 */
   __pyx_1 = __Pyx_Import(__pyx_n_scipy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":286 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":286 */
   Py_INCREF(Py_None);
   __pyx_k2 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":295 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":295 */
   Py_INCREF(Py_None);
   __pyx_k3 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":356 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":356 */
   Py_INCREF(Py_None);
   __pyx_k4 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":363 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":363 */
   Py_INCREF(Py_None);
   __pyx_k5 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":370 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":370 */
   Py_INCREF(Py_None);
   __pyx_k6 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k7 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":416 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":416 */
   __pyx_k8 = 0.0;
   __pyx_k9 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k10 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":446 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":446 */
   Py_INCREF(Py_None);
   __pyx_k11 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k12 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":459 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":459 */
   Py_INCREF(Py_None);
   __pyx_k13 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":466 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":466 */
   __pyx_k14 = 0.0;
   __pyx_k15 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k16 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":475 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":475 */
   Py_INCREF(Py_None);
   __pyx_k17 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":486 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":486 */
   __pyx_k18 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k19 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":495 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":495 */
   Py_INCREF(Py_None);
   __pyx_k20 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":502 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":502 */
   Py_INCREF(Py_None);
   __pyx_k21 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":511 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":511 */
   __pyx_k22 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k23 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":522 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":522 */
   Py_INCREF(Py_None);
   __pyx_k24 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":533 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":533 */
   Py_INCREF(Py_None);
   __pyx_k25 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":547 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":547 */
   Py_INCREF(Py_None);
   __pyx_k26 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":556 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":556 */
   Py_INCREF(Py_None);
   __pyx_k27 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":568 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":568 */
   Py_INCREF(Py_None);
   __pyx_k28 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":575 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":575 */
   Py_INCREF(Py_None);
   __pyx_k29 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":584 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":584 */
   Py_INCREF(Py_None);
   __pyx_k30 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":594 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":594 */
   Py_INCREF(Py_None);
   __pyx_k31 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":603 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":603 */
   Py_INCREF(Py_None);
   __pyx_k32 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":612 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":612 */
   Py_INCREF(Py_None);
   __pyx_k33 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":621 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":621 */
   __pyx_k34 = 0.0;
   __pyx_k35 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k36 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":630 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":630 */
   __pyx_k37 = 0.0;
   __pyx_k38 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k39 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":639 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":639 */
   __pyx_k40 = 0.0;
   __pyx_k41 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k42 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":648 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":648 */
   __pyx_k43 = 0.0;
   __pyx_k44 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k45 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":662 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":662 */
   __pyx_k46 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k47 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":671 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":671 */
   Py_INCREF(Py_None);
   __pyx_k48 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":682 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":682 */
   Py_INCREF(Py_None);
   __pyx_k49 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":698 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":698 */
   Py_INCREF(Py_None);
   __pyx_k50 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":711 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":711 */
   Py_INCREF(Py_None);
   __pyx_k51 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":725 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":725 */
   __pyx_k52 = 1.0;
   Py_INCREF(Py_None);
   __pyx_k53 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":734 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":734 */
   Py_INCREF(Py_None);
   __pyx_k54 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":743 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":743 */
   Py_INCREF(Py_None);
   __pyx_k55 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":755 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":755 */
   Py_INCREF(Py_None);
   __pyx_k56 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":776 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":776 */
   Py_INCREF(Py_None);
   __pyx_k57 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":788 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":788 */
   Py_INCREF(Py_None);
   __pyx_k58 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":845 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":845 */
   Py_INCREF(Py_None);
   __pyx_k59 = Py_None;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":923 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":923 */
   __pyx_1 = PyTuple_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; goto __pyx_L1;}
   __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":924 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":924 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_seed); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":925 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":925 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_get_state); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":926 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":926 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_set_state); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":927 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":927 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":928 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":928 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":929 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":929 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":930 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":930 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_uniform); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":931 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":931 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_rand); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":932 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":932 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_randn); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":933 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":933 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random_integers); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":934 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":934 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":935 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":935 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":936 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":936 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_beta); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":937 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":937 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_exponential); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":938 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":938 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_exponential); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":939 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":939 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_gamma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":940 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":940 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_gamma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":941 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":941 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_f); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":942 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":942 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_noncentral_f); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":943 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":943 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_chisquare); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":944 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":944 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_noncentral_chisquare); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":945 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":945 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_cauchy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":946 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":946 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_t); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":947 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":947 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_vonmises); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":948 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":948 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_pareto); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":949 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":949 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_weibull); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":950 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":950 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_power); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":951 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":951 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_laplace); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":952 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":952 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_gumbel); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":953 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":953 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_logistic); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":954 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":954 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_lognormal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":955 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":955 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_rayleigh); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":956 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":956 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_wald); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":957 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":957 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_triangular); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":959 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":959 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_binomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":960 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":960 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_negative_binomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":961 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":961 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_poisson); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":962 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":962 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zipf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":963 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":963 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_geometric); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":964 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":964 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_hypergeometric); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":965 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":965 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_logseries); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":967 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":967 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_multivariate_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":968 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":968 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_multinomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":970 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":970 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/kern/svk-projects/scipy_core/scipy/corelib/mtrand/mtrand.pyx":971 */
+  /* "/home/oliphant/core/scipy/corelib/mtrand/mtrand.pyx":971 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_permutation); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
diff --git a/scipy/corelib/mtrand/mtrand.pyx b/scipy/corelib/mtrand/mtrand.pyx
index c91102c78..67b30d14f 100644
--- a/scipy/corelib/mtrand/mtrand.pyx
+++ b/scipy/corelib/mtrand/mtrand.pyx
@@ -121,14 +121,14 @@ import scipy as _sp
 
 cdef object cont0_array(rk_state *state, rk_cont0 func, object size):
     cdef double *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Float64)
+        array = <ndarray>_sp.empty(size, _sp.Float64)
         length = PyArray_SIZE(array)
         array_data = <double *>array.data
         for i from 0 <= i < length:
@@ -137,14 +137,14 @@ cdef object cont0_array(rk_state *state, rk_cont0 func, object size):
 
 cdef object cont1_array(rk_state *state, rk_cont1 func, object size, double a):
     cdef double *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state, a)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Float64)
+        array = <ndarray>_sp.empty(size, _sp.Float64)
         length = PyArray_SIZE(array)
         array_data = <double *>array.data
         for i from 0 <= i < length:
@@ -154,14 +154,14 @@ cdef object cont1_array(rk_state *state, rk_cont1 func, object size, double a):
 cdef object cont2_array(rk_state *state, rk_cont2 func, object size, double a, 
     double b):
     cdef double *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state, a, b)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Float64)
+        array = <ndarray>_sp.empty(size, _sp.Float64)
         length = PyArray_SIZE(array)
         array_data = <double *>array.data
         for i from 0 <= i < length:
@@ -172,14 +172,14 @@ cdef object cont3_array(rk_state *state, rk_cont3 func, object size, double a,
     double b, double c):
 
     cdef double *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
     
     if size is None:
         return func(state, a, b, c)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Float64)
+        array = <ndarray>_sp.empty(size, _sp.Float64)
         length = PyArray_SIZE(array)
         array_data = <double *>array.data
         for i from 0 <= i < length:
@@ -188,14 +188,14 @@ cdef object cont3_array(rk_state *state, rk_cont3 func, object size, double a,
 
 cdef object disc0_array(rk_state *state, rk_disc0 func, object size):
     cdef long *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Int)
+        array = <ndarray>_sp.empty(size, _sp.Int)
         length = PyArray_SIZE(array)
         array_data = <long *>array.data
         for i from 0 <= i < length:
@@ -204,14 +204,14 @@ cdef object disc0_array(rk_state *state, rk_disc0 func, object size):
 
 cdef object discnp_array(rk_state *state, rk_discnp func, object size, long n, double p):
     cdef long *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state, n, p)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Int)
+        array = <ndarray>_sp.empty(size, _sp.Int)
         length = PyArray_SIZE(array)
         array_data = <long *>array.data
         for i from 0 <= i < length:
@@ -221,14 +221,14 @@ cdef object discnp_array(rk_state *state, rk_discnp func, object size, long n, d
 cdef object discnmN_array(rk_state *state, rk_discnmN func, object size, 
     long n, long m, long N):
     cdef long *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state, n, m, N)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Int)
+        array = <ndarray>_sp.empty(size, _sp.Int)
         length = PyArray_SIZE(array)
         array_data = <long *>array.data
         for i from 0 <= i < length:
@@ -237,14 +237,14 @@ cdef object discnmN_array(rk_state *state, rk_discnmN func, object size,
 
 cdef object discd_array(rk_state *state, rk_discd func, object size, double a):
     cdef long *array_data
-    cdef ArrayType array "arrayObject"
+    cdef ndarray array "arrayObject"
     cdef long length
     cdef long i
 
     if size is None:
         return func(state, a)
     else:
-        array = <ArrayType>_sp.empty(size, _sp.Int)
+        array = <ndarray>_sp.empty(size, _sp.Int)
         length = PyArray_SIZE(array)
         array_data = <long *>array.data
         for i from 0 <= i < length:
@@ -303,13 +303,13 @@ cdef class RandomState:
         the clock otherwise.
         """
         cdef rk_error errcode
-        cdef ArrayType obj "arrayObject_obj"
+        cdef ndarray obj "arrayObject_obj"
         if seed is None:
             errcode = rk_randomseed(self.internal_state)
         elif type(seed) is int:
             rk_seed(seed, self.internal_state)
         else:
-            obj = <ArrayType>PyArray_ContiguousFromObject(seed, PyArray_LONG, 1, 1)
+            obj = <ndarray>PyArray_ContiguousFromObject(seed, PyArray_LONG, 1, 1)
             init_by_array(self.internal_state, <unsigned long *>(obj.data),
                 obj.dimensions[0])
 
@@ -318,8 +318,8 @@ cdef class RandomState:
 
         get_state() -> ('MT19937', int key[624], int pos)
         """
-        cdef ArrayType state "arrayObject_state"
-        state = <ArrayType>_sp.empty(624, _sp.Int)
+        cdef ndarray state "arrayObject_state"
+        state = <ndarray>_sp.empty(624, _sp.Int)
         memcpy(<void*>(state.data), self.internal_state.key, 624*sizeof(long))
         return ('MT19937', state, self.internal_state.pos)
         
@@ -330,13 +330,13 @@ cdef class RandomState:
         
         set_state(state)
         """
-        cdef ArrayType obj "arrayObject_obj"
+        cdef ndarray obj "arrayObject_obj"
         cdef int pos
         algorithm_name = state[0]
         if algorithm_name != 'MT19937':
             raise ValueError("algorithm must be 'MT19937'")
         key, pos = state[1:]
-        obj = <ArrayType>PyArray_ContiguousFromObject(key, PyArray_LONG, 1, 1)
+        obj = <ndarray>PyArray_ContiguousFromObject(key, PyArray_LONG, 1, 1)
         if obj.dimensions[0] != 624:
             raise ValueError("state must be 624 longs")
         memcpy(self.internal_state.key, <void*>(obj.data), 624*sizeof(long))
@@ -376,7 +376,7 @@ cdef class RandomState:
         """
         cdef long lo, hi, diff
         cdef long *array_data
-        cdef ArrayType array "arrayObject"
+        cdef ndarray array "arrayObject"
         cdef long length
         cdef long i
 
@@ -394,7 +394,7 @@ cdef class RandomState:
         if size is None:
             return rk_interval(diff, self.internal_state)
         else:
-            array = <ArrayType>_sp.empty(size, _sp.Int)
+            array = <ndarray>_sp.empty(size, _sp.Int)
             length = PyArray_SIZE(array)
             array_data = <long *>array.data
             for i from 0 <= i < length:
@@ -852,14 +852,14 @@ cdef class RandomState:
         as long as sum(pvals[:-1]) <= 1).
         """
         cdef long d
-        cdef ArrayType parr "arrayObject_parr", mnarr "arrayObject_mnarr"
+        cdef ndarray parr "arrayObject_parr", mnarr "arrayObject_mnarr"
         cdef double *pix
         cdef long *mnix
         cdef long i, j, dn
         cdef double Sum
 
         d = len(pvals)
-        parr = <ArrayType>PyArray_ContiguousFromObject(pvals, PyArray_DOUBLE, 1, 1)
+        parr = <ndarray>PyArray_ContiguousFromObject(pvals, PyArray_DOUBLE, 1, 1)
         pix = <double*>parr.data
 
         if kahan_sum(pix, d-1) > 1.0:
@@ -873,7 +873,7 @@ cdef class RandomState:
             shape = size + (d,)
 
         multin = _sp.zeros(shape, _sp.Int)
-        mnarr = <ArrayType>multin
+        mnarr = <ndarray>multin
         mnix = <long*>mnarr.data
         i = 0
         while i < PyArray_SIZE(mnarr):
diff --git a/scipy/corelib/mtrand/scipy.pxi b/scipy/corelib/mtrand/scipy.pxi
index 7939a30b5..9c7b4d01c 100644
--- a/scipy/corelib/mtrand/scipy.pxi
+++ b/scipy/corelib/mtrand/scipy.pxi
@@ -29,24 +29,24 @@ cdef extern from "scipy/arrayobject.h":
 
     ctypedef int intp 
 
-    struct PyArray_Descr:
-        int type_num, elsize
-        char type
+    ctypedef extern class scipy.dtypedescr [object PyArray_Descr]:
+        cdef int type_num, elsize
+        cdef char type
 
-    ctypedef extern class scipy.ArrayType [object PyArrayObject]:
+    ctypedef extern class scipy.ndarray [object PyArrayObject]:
         cdef char *data
         cdef int nd
         cdef intp *dimensions
         cdef intp *strides
         cdef object base
-        cdef PyArray_Descr *descr
+        cdef dtypedescr descr
         cdef int flags
 
-    ArrayType PyArray_SimpleNew(int ndims, intp* dims, int item_type)
+    ndarray PyArray_SimpleNew(int ndims, intp* dims, int item_type)
     int PyArray_Check(object obj)
-    ArrayType PyArray_ContiguousFromObject(object obj, PyArray_TYPES type, 
+    ndarray PyArray_ContiguousFromObject(object obj, PyArray_TYPES type, 
         int mindim, int maxdim)
-    intp PyArray_SIZE(ArrayType arr)
-    void *PyArray_DATA(ArrayType arr)
+    intp PyArray_SIZE(ndarray arr)
+    void *PyArray_DATA(ndarray arr)
 
     void import_array()