revisions of revisions...
some more revisions
some more revisions 2
some more revisions 3
Merge remote-tracking branch 'giannis/master'

Conflicts:
	papers/Kieffer_Ashiotis/pyFAI.rst