Merge pull request #5 from steveklabnik/master

Fixes for a clean build.