checked out john's file from his branch
wrote test script
moved tests to test directory
moved tests around, cleaned up root dir
moved test around
Merge pull request #7 from mammothbane/nathan

merge testing
merged john's changes