Editing makefiles and .gitignore files for tests.
Merge branch 'devel' of github.com:/dmorse/simpatico into devel