Merge pull request #7 from killtheliterate/master

Add some stuff to stream bouncer
Merge pull request #8 from killtheliterate/master

Add some junk
cleanup
Do some junk