Clean up site.yml reading; clean up rake task utilities; make new archive get created in correct place.
Merge remote-tracking branch 'origin/master'