Merge pull request #60 from bodepd/master

Remove cobbler from site_manifest
update grizzly branches