Update .gitignore
Fixed some merge bugs.
Fix erb snafu and added iso/** ignore to .gitignore