m4: Rebuild with new files layout.
rebase: Move to /usr layout
vim: Update to 7.4.335