Extended matplotlib lesson. More information about managing figures and saving raster/vector graphics. Added more information about styling the plot (color, line and marker styles) and axes (scale, ticks, labels). Added a list of supported plot variants. Fixed some obvious mistakes.
Added plos full text data and leson on tm
Merge pull request #1 from datacarpentry/master

updating my fork (I think)
completed text mining lesson
renamed to convention
adding social_science_text_mining_surveys
Merge remote-tracking branch 'upstream/master' into extending-matplotlib-lesson

Conflicts:
	lessons/python/07-plotting-with-matplotlib.md
Fixed section levels to match changes introduced in the upstream.
Merge pull request #55 from emhart/master

Text mining lessons
Merge pull request #56 from benmarwick/adding-tutorial-on-text-mining-surveys-with-R

Adding tutorial on text mining surveys with r
Merge pull request #29 from turlog/extending-matplotlib-lesson

Extended matplotlib lesson
Merge branch 'master' of https://github.com/datacarpentry/datacarpentry

Conflicts:
	lessons/python/07-plotting-with-matplotlib.md