Upgrade submodules to 5.4.0

Still need to flesh out scripts to make future upgrades easy
OSX now builds with C++11 and harfbuzz