fix params
update for yesod-form-1.3.15.4
deal with network-uri split, in a backwards-compatable way
Merge branch 'master' of ssh://git-annex.branchable.com