Undoing earlier overzealous pull request

With these change, I can again build the embedded package, and can do so without touching other files.

devtools still does get installed multiple times even from CRAN -- I don't really care as I don't use it. 

I may take a break here.  The project does what I need it to do for my work on github.