First Pull Request

Merging changes to satisfy Puppet, I hope.