initial commit
merging master with new foreman automatic
Merge pull request #2 from uobdic/foreman_merge

Merge with changes for foreman 1.2
removing modules from git
changes to puppet.conf due to migration for foreman 1.2