grab bag
passing tests
tests
Merge pull request #46 from craigspaeth/polish

@dzucconi: Grab bag of bugs/polish