Make some errors nicer to read
Merge pull request #1113 from mfalesni/slight-polishing

Make some errors nicer to read
pxe form changes to include template add button
Merge pull request #1136 from nachandr/pxe_model_fixes

pxe form changes to include template add button
Convert VMWareSystem to psphere
Make deploy_template and colne_template work ;)