fixed few bugs, cleaned up code
Merge branch 'master' of https://github.com/adamgignac/tapestry