More heap tweaks.

This changeset typedefs the heap object and adds a 'heap_peek' function
cleaning up the makefiles a little bit
updating the heap test to check that heap_peek is always returning the same value as heap_pop