Narrowed the scope of method_missing calls, reenable debugging output
Merge branch 'master' into sl_model