Merged with github, edited README.md
Merge branch 'master' of https://github.com/mikekuehn/my-docpad-site