A bit of renaming
Merge branch 'master' of github.com:swcarpentry/iuse2014
Moving files around for consistency