.gitignore for sublime
merge?