Modified unit impl and factory to support armors better
Merge branch 'master' of github.com:kyldvs/wwf