Update to latest ctools/panels and clean up make file