Revert bc404fc..c8d964c

This rolls back to commit bc404fc4ec8dded9f38e88d094ebf8646eab5061.
Reverting back from manual pyicloud master sync

Trying to isolate how to do this properly with Github Mac Client (Docs
suck)