Merge branch 'master' of github.com:edmcman/pygments-latex-styles

Conflicts:
	README.md