Merge pull request #40 from davidmsibley/master

ignoring nb-configuration.xml