adding latest from master to gh-branch
Merge branch 'gh-pages' of github.com:datacarpentry/2014-09-29-iDigBio into gh-pages