Rewrote sepstream and tokenstream to be less ugly
s/seperator/separator/g
Merge pull request #550 from Adam-/master+sepstream

Rewrote sepstream and tokenstream to be less ugly