uckelman-merge@2178-2181 clean up imports
uckelman-merge@2178-2181 clean up imports

git-svn-id: 3948e88432e1a59e1cb2bc472f8f957688004121@2205 67b53d14-2c14-4ace-a08f-0dab2b34000c

ethaneldridge/vassal,ethaneldridge/vassal,ethaneldridge/vassal