Compatibility with current Nengo master branch

A couple of quick changes to make Brainspawn get along with the current Nengo master branch (commit 5d01251bc2b4374b0acabc9944bda52bb599bff9). These are just some quick hacks, need some review, and might be done in a better way. I might spent some more thought on it later.