Neutron Refactoring

v2_0 -> v2
No options (redesign)
More features (extension-related)
Some bugfixes
This is just copied over from neutron v2_0 to ensure live tests can work the same way. It will be removed eventually, but I don't want to change it till then.