Added output directories to .gitignore.
Merge master to develop.

(grabbing .gitignore changes)