Add support for swapping streams
aesthetic cleanup
Dependency cleanup
Merge pull request #5 from stephen/stephen-fix-4

Add support for changing streams dynamically