Merge pull request #22 from zachriggle/master

hexii for shellcraft
link_map can be found in both .got and .got.plt so if one is missing try
the other.
Merge pull request #24 from RobertLarsen/master

link_map can be found in both .got and .got.plt so if one is missing try the other.