Merge pull request #2 from datacarpentry/master

Get changes from upstream into Jenny's fork