Fix bad merge
Merge pull request #56 from dstockwell/fix-everything

Fix bad merge