updated gitignore
merged master in 2.0.0