Fix git cruft and remove subl alias