Merge "ignore /.deploy used by git-deploy"