Deleting file (accidentally added in a recent merge).
Fixing merge with devel branch.
Merge pull request #86 from jwj61/devel

Devel