Clean up, handle assorted error codes
There are unresolved merge conflicts
Merge branch 'master' of github.com:ajay-gandhi/fb-cli