add basic ceilometer tests
first pass at some neutron tests
some more neutron tests
fix merge conflict
Merge pull request #20 from mancdaz/master

Add neutron tests