BUG: made some changes to inner_opt cyhon (see diff or notes). Returned bellman.py to run from (1, params.Niter) not (1, 11)
BUG: Cleaned up merge issues