AMOS updated
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life