Renamed test files and removed __init__.py from base directory.  Use python test.py or nosetests now to run tests.
Merge pull request #17 from jrhoads/f-rework-tests2

Renamed test files and removed __init__.py from base directory.  Use python test.py or nosetests now to run tests.