Merge ViewStep & gitignore commits