Merge master-jan2014 to master and remove ssdp requirement

Hey Dal,

I made the mistake of merging on my fork before I made some fixes, and couldn't figure out how to just send a pull request for one file to a different branch, so feel free to reject this if you're not ready to merge to master yet...

But! This fixes an issue where you're including ssdp, as well as node-ssdp - as far as i can see, you're not using ssdp, but ssdp fails to install and stops the package being dependable on for Mac OS X.