fixed @patch references to nectar
Merge branch 'jconnor-cut-over-to-nectar'
Merge branch 'master' into mhrivnak-newimporter
Merge branch 'mhrivnak-newimporter' of github.com:pulp/pulp_rpm into mhrivnak-newimporter