Try to use a fork of Dan's openstack-puppet repo modules

Some small fixes trying to get stuff to work w/ the modules
packstack pulls in
Merge remote-tracking branch 'upstream/folsom_quantum' into folsom_quantum