update to artifactory 3x layout
lint fixes
Merge pull request #6 from jlambert121/artifactory_3x

update to artifactory 3x layout
Merge branch 'master' into rake_update