Change style of higher-order functions

* Use infix notation for higher-order functions, as recommended
  in the style guide
  http://docs.scala-lang.org/style/method-invocation.html#higher-order-functions
Merge pull request #33 from patriknw/wip-style-patriknw

Change style of higher-order functions