Merge pull request #13 from jwayne/josh

Singlerun works.
remove ipdb