updated wikienergy converter to new dataport database
Merge branch 'master' of https://github.com/nilmtk/nilmtk
added windows installation instruction for psycopg2