Addresses https://github.com/nilmtk/nilmtk/issues/84#issuecomment-31738335
Merge branch 'master' of https://github.com/nilmtk/nilmtk
export_csv almost completed