Revert "Merge branch 'master' of https://github.com/lra/mackup into ToggleApps"

This reverts commit 7772f51f43724a1510e4cdf9a6bf87051d2ffcd3, reversing
changes made to c459fdaf78fe9ee6e5538cf7b82095165b6e1b48.
Made pep8 compliant