There's something strange going on in this pull request on GitHub and I'm not being able to comment there:
@frapell @davisagli do you mind if I revert the commits made on Mar 20, 2014 just for the sake of the code reviewer?
those can be applied later in the master branch.