more degherkining of the repo.
Merge pull request #15 from pdehaan/degherkin

more degherkining of the repo.