Messaging fixes/tweaks. Merge s3forms fix from Pat
Merge branch 'master' of git://github.com/flavour/eden