autodoc now works; but I still need to re-enable numpydoc, I think
used sphinx-apidoc to auto-generate documentation for entire of
nilmtk.  Still need to re-enable numpydoc
Merge branch 'master' of github.com:nilmtk/nilmtk

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.