Add geppetto generated metadata.json to .gitignore
refer to complete key in private key file
Merge pull request #36 from kraman/bugfix

Fix to install dependencies for rdiscount gem.
Adding v2 cart support.
Merge pull request #38 from kraman/v2_carts

Adding v2 cart support
Merge branch 'master' into cleanup
facter 1.6.18 is now in the fedora updates stable repos. This is no longer needed.
Switching to using augeas to modify pam files
Merge pull request #35 from markllama/dev/dns_key_source

refer to complete key in private key file
Merge pull request #39 from rharrison10/cleanup

facter 1.6.18 is now in the fedora updates stable repos
Merge pull request #40 from kraman/pam_augeas

Switching to using augeas to modify pam files [test]
Calling oo-admin-cartridge whenever v2 cartridges are installed
Adding the SESSION_SECRET configs to the broker and console
Warning the user to change the default secrets

Conflicts:

	manifests/init.pp
update sshd_config for jenkins and add as7 cart for Fedora
Fixing encoded password for oo-mongo-setup

oo-mongo-setup needs to use the puppetized mongo password and auth salt
Fixes for the htpasswd auth plugin
Merge pull request #45 from brenton/remote-user-fixes1

Fixes for the htpasswd auth plugin
Merge pull request #44 from bdecoste/master

update sshd_config for jenkins and add as7 cart for Fedora
Merge pull request #42 from brenton/master

Adding SESSION_SECRET settings to the broker and console / minor v2 cart stuff