Also update build-tools for Travis
Revert General Section add to fix null pointer crash