ignore vc11 build
Merge branch 'master' of github.com:badgerman/atlantis1
fix  detection of factions that are not alive

write new tests
update old tests