added likelihood choice to control file.
stash
Merge branch 'MartellDeveloper' of https://github.com/seacode/gmacs into MartellDeveloper
jlas'
Chaning file names
renamed gsmac to gmacs