Updating to 2.0.
Stopped ignoring .gitignore.
Merge branch '2.0'