Merge pull request #1 from mpath/utility_functions

Utility functions
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from jmeridth/master

merge jms master
Conflicts
Merge pull request #36 from mpath/conflictor

Migration writes to neutron tables