Fixed James' stupid issue where unit counts were showing up as NAN
Merge branch 'master' into jason-working
Merge pull request #2 from jtymann/jason-working

Jason working