Merge pull request #6 from steveklabnik/master

Fix 'make tidy'
Fix the build