These files were lost when rebasing this branch from master prior to commiting, not sure why
more cleanup.
Merge pull request #321 from edx/e0d/merge-problem

E0d/merge problem