Merge pull request #321 from steveklabnik/master

Future-proof git add
Merge pull request #322 from steveklabnik/master

Regenerate CNAME on deploy.