Two file merge conflicts, __init__.py and upnp.py, were not resolved correctly by the automatic resolving (probably because the affected code was written by other people and I merged them into mailchuck fork). This changes it to the same code that is in the mailchuck fork)