clean up files and squash bugs
Merge pull request #5 from stevenspiel/sps/clean-up

clean up files and squash bugs