Minor changes to read_some_lines
Tidy up
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/empaisley/Stuff