All in one and site.pp updates

All-in-one, site.pp, and core.pp fixes.  Works with multi-node and all-in-one installs.

No bug, Rally: TA289, US115

HowTo:
http://docwiki.cisco.com/wiki/OpenStack:Folsom-All-in-One

HowTo needs to be updated when this is complete.

Will also require a folsom-manifests update (adding now).