Updates from development branch.
Fixed up .gitignore