fix warning
manual fixups of spices etc
update for yesod-form-1.4.0.2
Merge branch 'master' of ssh://git-annex.branchable.com