fix upnp on non-default port

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #540 from benemorius/upnp

fix upnp on non-default port
Merge branch 'master' into tmp-avro
rename avroproto.py