move roles from tsuru
fixed gitignore confilct