Merge pull request #1 from badfortrains/refactor_new

Refactor new
Merge branch 'master' of git://github.com/badfortrains/wupnp
Raspberry media_watcher