Merge pull request #1 from gvwilson/master

Bringing in all material from old repo.
Cleaning up the build process
Merge branch 'master' of https://github.com/swcarpentry/guide