implemented 'Electric.activity_distribution'.  And always round and
cast 'sample_period' to an int (otherwise pd.resample complains)
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.