Add Functor and some makefile things
Update HoTT