Minor fixes.
Updated gitignore
Merge remote-tracking branch 'github/nbback' into nbback