Line wrap

In this branch I've wrapped each of the files to 80 characters and reformatted a few control blocks to match the Scala style guide (curly braces around if blocks not followed by else, for example). The code builds, so there are no compiler errors, but I don't have any examples to run against to make sure that I didn't accidentally mess anything up in a more subtle fashion.