Adjustments to get nosetests working again
Merge pull request #20 from chadlung/master

Adjustments to get nosetests working again