updated parameter list as of may 2013
Merge branch 'cxi65913' of github.com:antonbarty/cheetah into cxi65913