Jgrep merge

well let's not ever let the lag between initial branch and pull request take this long again.

the jane-didn't-sleep-and-has-been-working-twelve-hours-and-is-now-finally-drinking-at-the-hotel-bar-commit-selfie.

![photo on 22-12-2014 at 14 24](https://cloud.githubusercontent.com/assets/777319/5522184/6c50667c-89e6-11e4-84dd-c8ff87e45271.jpg)