Fixes reference to relative path of katello-installer to be generic of vagrant.
Merge pull request #44 from ehelms/fix-relative-path

Fixes reference to relative path of katello-installer to be generic of v...
Allow custom deployment location
Update puppet if it is already installed
Merge pull request #46 from elyezer/puppet-update

Update puppet if it is already installed
Merge pull request #47 from daviddavis/temp/20140509131846

Allow custom deployment location
When puppet gem is installed, the RPM and gem need to be removed and
installed like any other deployment.
Merge pull request #49 from ehelms/handle-puppet-gem

When puppet gem is installed, the RPM and gem need to be removed and
adding katello-bats