@scottpurdy Please see https://github.com/numenta/nupic/pull/407/commits ,
those commits are not made by me and are already merged in master. I don't
know why it shows up here, but travis says the merge is clean, so it should
work (when the commits are already in, merge will ignore them)