Merge pull request #119 from jhmatthews/dev

Changing dev to contain the whole structure, minus data
mytrap use commented out, do.c deleted, see #111