Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion