Merge branch 'devel' into coulomb
Merge branch 'coulomb' of github.com:/dmorse/simpatico into coulomb