Extra Header Options and Windows New line compatibility

Hey Nate,
Don't know if you want to pull these in but I thought I might as well pass them back. There are two useful things I changed and one that might just get in the way but was helpful for me:

1. File.readlines (at least on 1.9, don't know about 2.0) has crappy support for windows carriage return style newlines ("\r\n"), so I explicitly replaced them in a few places. Not that anyone is doing analysis on windows, but, well, eprime, you know... **gah**.
2. Add an extra option to concatenate multiple lines of header (Superlab is the culprit here - they wrote their header in two "readable" lines - there's an option for to merge a number of lines together in the header. Option defaults to 1 so there should be no api breaks and your current tests passed.
3. Should have done this in a separate topic branch, but I also replaced echoe with bundler for gem management. I did this a while ago and honestly don't remember why I had to, but there was some good reason. I didn't send a PR 'cause I didn't know if you wanted to pull this as well.