Add etc/makefile.usr to list of files to commit; separate master and release commits