Resellers update.
Merge branch 'master' of git@github.com:gcwnow/www