add network-manager neutron to charmconf

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Sort displayed services by priority
merge with master
pep8 fixes
Merge pull request #68 from mikemccracken/group-service-display

Sort displayed services by priority
Merge branch 'master' into patch-enable-neutron