Streams 133

Refactored the way we handle SyndEntries so that the process is cleaner and more comprehensive. Added in relevant unit tests