Style guide updates

As per debate thread: https://groups.google.com/forum/#!topic/scala-debate/CzlQg-TCKbA

I've added separate commits for points 1), 2), 5), 6), 7), 8) and 9), as per Martin's comments.  Simon had already fixed 3).