Marking as obsolete
Updating conventions
Merge branch 'master' of https://github.com/ipjohnson/Grace.git