Rename Empty_set to Empty, as discussed.
Make TAGS get made by default by "make", provided "etags" is present.
Merge branch 'master' of github.com:HoTT/HoTT
Merge remote branch 'upstream/master'