Merge branch 'lokI8-headnode_img_query' into devel
Merge branch 'devel' of github.com:lokI8/haas into devel
Merge branch 'devel' of github.com:CCI-MOC/haas into devel
Add example puppet manifests to configure headnode.

Manifests add services to pxe boot machines off headnode.
See README.md for more information.
Add example puppet manifests to configure headnode.

Manifests add services to pxe boot machines off headnode.
See README.md for more information.
Merge branch 'puppet' of git://github.com/zenhack/haas into puppet
Merge pull request #345 from lokI8/puppet

Puppet