Squashed commit of the following:
refactored team construction into its own function
commit a07943db694a2dcbf4f49d35f36a8763edf729a5
Author: cpjk <cpjkelly@gmail.com>
Date:   Fri Jan 17 13:57:04 2014 -0800

    load_team() has its own function
Merge branch 'master' of https://github.com/cpjk/battle
local master tip was behind remote