Added settings catalog to git ignore and fixed form clean up bug