Add scarfolk
update deps
Set timeouts
Merge ssh://rootdev.net/~/aggie

Some local additions to feeds.