tools/deploy: deploy to s3; removed .ftp_upstream.
Deploy only site stuff.
Deploy .git dir.
tools/deploy: *.dat also, as they are linked.
deploy only allowed in master branch.
deploy: skip gitk cache.
s3fixmeta.
Merge branch 'devel'
s3fixmeta: my site uses xhtml, not some funny html.
Merge branch 'devel'