Merged openstack-utils with this repo.
Broke out default into modules after openstack-utils merge

Since openstack-utils had things broken out, felt having things in
default wasn't as clean.  Broke things out into modules, cleaned
up tests, and a few rogue ()'s :).