Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from jonnnnyw/master

Add settable ports for socket connect
Allow User Stream to have track parameters
Merge pull request #58 from sbeca/add-user-stream-track

Allow User Stream to use track parameters
Merge pull request #3 from fennb/master

Merge fennb/phirehose@4031d77
Merge pull request #4 from r-sal/master

Allow User Stream to use track parameters