Responded to Tim's comments.
Switched to using bufio.scanner, some other cleanup and added some tests.