Removing some files not needed.
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
Merge branch 'master' into develop