pick up the tests
fix errors

use proper sytnax, comment out half-built code, etc
Merge pull request #1 from steveklabnik/master

fixes