More bug fixes on edit VC
Merge branch 'master' of https://github.com/naomihimley/PubChatter