Merge pull request #3 from brdude/master

Various changes
Merge pull request #4 from brdude/master

Remove duplicate puppi::netinstall
Fixed fixtures for Travis tests