changed when some params are computed
changes to default conf filet
Merge branch 'master' of github.com:andrewpaulreeves/pyAOS