Update deps, add new sub-deps to makefile.

Seeing how this does against travis.