blegh
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.
Added sky parallax, minimap

Added parallax for the sky background.  Made a minimap that draws in the
bottom left corner without a GUI border.
Changed minimap representation

The minimap now shows the shape of actual islands instead of green
circles.

Also, fixed the NPC speech bubble not appearing correctly.
Merge remote-tracking branch 'upstream/animation'