Cleaned up Neutron and Nova drivers

The old drivers were a bit hard for people to understand.

This change simplifies the drivers a bit and improves things like
variable naming.

Change-Id: Ie3f81b825af144cf4483c5cad82099658fe5dee9
Merge "Cleaned up Neutron and Nova drivers"