Some merge cleanup

Fixed multiple bugs, included code changes that were left behind from
the animation branch.  Adjusted the NPC class so that it is carried with
the island that it spawns on.  Moved the starting island to the center
of the global map.