Fatal error registering BuddyPress / Membership 2

I can't figure out what caused the issue - all my testing was going great and then I did some work which I believe virtually all of it I have reversed, but I keep getting this error when I register a user.

[Mon Nov 23 14:03:25 2015] [error] [client 66.249.79.240] PHP Fatal error: Call to a member function add_membership() on a non-object in /nas/content/live/sobsol/wp-content/plugins/membership/app/addon/searchindex/class-ms-addon-searchindex.php on line 286
[Mon Nov 23 14:03:46 2015] [error] [client 66.249.79.233] PHP Fatal error: Call to a member function add_membership() on a non-object in /nas/content/live/sobsol/wp-content/plugins/membership/app/addon/searchindex/class-ms-addon-searchindex.php on line 286
[Mon Nov 23 14:04:23 2015] [error] [client 66.249.79.247] PHP Fatal error: Call to a member function add_membership() on a non-object in /nas/content/live/sobsol/wp-content/plugins/membership/app/addon/searchindex/class-ms-addon-searchindex.php on line 286

I enabled support if you want to look - I need to get some rest and this troubleshooting has sent me down a 3 hour rabbit hole. Anyway, it isn't live so you can feel free to look and test.

Thanks, Dave