Several bug fixes.
Merge branch 'master' of git://github.com/handl/Viewpoint into handl_master
Bug fix-ups for subscription stuff in relation to #folder_ids!
minor test fix-ups