Update gitignore
Remove gitatt and gitig
Merge branch 'zemplate_3.1' of github.com:zenman/zemplate into zemplate_3.1