Merge remote-tracking branch 'upstream/develop' into task/add_puppet_config_attibutes
change jetty debug port to 4000 and working port to 8082
add hiera support to attributes
fix merge conflicts
change nexus uri
change trtavis config
Merge pull request #12 from alberts-tid/task/add_puppet_config_attibutes

Task/add puppet config attibutes