Fixing the things I broke
Merge pull request #25 from theodi/Phil-edits

Fixing the things I broke