Map and inject have fundamental problems; will write them in Angort
for now.
Merge branch 'master' of github.com:jimfinnis/angort