Yo, merge this shit.

I cleared things up with Nick and he's using the same version of slidify that we're using.