Merge pull request #80 from rjleveque/fix_tests

fixed tests so nosetests/travis works better?