Reorganize site.yml

Also corrects a bunch of issues in keystone Apache setup

Still getting permissions issues. :(
Merge pull request #3 from jaypipes/keystone

Reorganize site.yml