Merge branch 'master' into working
Stylistic cleanup only. No logic changes.
Merge branch 'master' into working
Merge branch 'working' of github.com:dabodev/dabo into working
Reverted the changes to setup.py in 2f73871.

It turns out that to handle both PyPI and direct setup.py installs, the
additional files to install have to be in both the `data_files`
parameter of setup.py, as well as in the MANIFEST.in file.