Started to put inner_opt into cython.  May not be necessary depending on how much increase we get from compecon being cythoned
Cython
merge