Merge pull request #616 from bhariharan/master

Disallowing removal of accounts from the Settings app
Removing AccountWatcher