prep for merge

dammit I suck at git
Merge branch 'master' of github.com:psathyrella/recombinator