Properly adds puppet options with out wiping out previous options.
Removes run stages
Removes the need to gem install puma.
Adds line and phantomjs modules.
Fixed merged conflicts.