Some work on account deletion
Merge pull request #561 from cvogeley/master

Some work on account deletion