Should not track user files
Merge remote-tracking branch 'watersu'