Upload
Took out most 'inoctave' changes.
Merge branch 'John's-branch'
Added options to the model

The options are passed to model via a structure. Undefined options are
assigned default values.
Switched out 'disp' with 'println'

In octave, 'disp' doesn't display the output until the end of
computation unless you 'fflush(stdout)'. 'println' does just 'disp' for
MATlab.
Added Options, vectorized trapF
Merge branch 'John's-branch'
Merge branch 'Matt's-branch'
Fixed error in merge
Merge branch 'master' into Merge-Matt

Conflicts:
	trapModel.m
Updated model