merge conflicts, etc.

[kellyrowland]

Hi,

I'm interested in making a change + PR on one of the iPython notebooks, but after cloning the master branch and then pulling the dev branch, I get a merge conflict error. Could this be resolved and pushed to the repo?