Upgrading ctools and fixing gitignore issues