Fixed issues related to the version change of the Pixmap utility.
Changed import vooga.rts.util.Vector to util.Vector.
Update GameManager.java

For some reason I just found that these changes had been deleted by all the repo madness.
Merged and deleted old classes that came from upstream.
Update GameManagerRunAlone.java

I found that this file too had been overwritten with a previous version.  Changed it.
Removed more old cold from upstream.
Tried to fix the Arcade.

Since it seems like one of my teammembers accidentally changed things
related to the arcade, I am going to try fixing that with this commit.
Arcade team, I would appreciate if you could take a look in it. Sorry...
Update GameManagerRunAlone.java

I know believe all of our files are how they were intended to be for the push this morning
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Deleted unused import that was breaking Pixmap.
Removed our location class due to upstream merge
Removed our location class due to upstream merge
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Fixed Pixmap import.
Fixed merge conflict in the map from upstream. Added back the correct reachedGoal method
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Fixed upstream merge problems in the level editor code. Changed test map to ensure this worked
Fixed overwritted code in production
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into davidAndEllangoGame