Add print function and clean up the mess I made merging
Merge branch 'master' of https://github.com/adamgignac/tapestry