helloworld

This pull request brings your master branch up to date with your urls-and-base-template branch. If you accept this pull request, I'll bring some more of your changes from my dev branch into my master branch, and then we can start talking about whitespace.