Little bit of cleanup

Made sure all 3rdParty paths are relative, and fixed a few instances of
GIT screwery caused in my last merge